Merge branch 'master' into patch-2

.gitattributes

@@ -1,2 +1,3 @@
 * text=auto
 *.ai binary
+readme.md merge=union

code-of-conduct.md

@@ -0,0 +1,50 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic
+  addresses, without explicit permission
+* Other unethical or unprofessional conduct
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+By adopting this Code of Conduct, project maintainers commit themselves to
+fairly and consistently applying these principles to every aspect of managing
+this project. Project maintainers who do not follow or enforce the Code of
+Conduct may be permanently removed from the project team.
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer at sindresorhus@gmail.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Maintainers are
+obligated to maintain confidentiality with regard to the reporter of an
+incident.
+
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 1.3.0, available at
+[http://contributor-covenant.org/version/1/3/0/][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/3/0/

contributing.md

@@ -1,6 +1,9 @@
 # Contribution Guidelines
 
+Please note that this project is released with a [Contributor Code of Conduct](code-of-conduct.md). By participating in this project you agree to abide by its terms.
+
 ## Table of Contents
+
 - [Adding to this list](#adding-to-this-list)
 - [Creating your own awesome list](#creating-your-own-awesome-list)
 - [Adding something to an Awesome list](#adding-something-to-an-awesome-list)

create-list.md

@@ -1,9 +1,9 @@
 # Creating Your Own List
 
 - Read the [awesome manifesto](https://github.com/sindresorhus/awesome/blob/master/awesome.md) and ensure your list complies.
-- Wait at least a couple of weeks after creating a list before submitting to this list to give it a chance to mature.
 - Search this list before making a new one, as yours may be a duplicate. If it is, try and contribute to the best one instead of making your own.
-- Add the [awesome badge](https://github.com/sindresorhus/awesome/blob/master/awesome.md#awesome-badge) to your readme.
+- Your awesome list should have the [awesome badge](https://github.com/sindresorhus/awesome/blob/master/awesome.md#awesome-badge), a [license](https://github.com/sindresorhus/awesome/blob/master/awesome.md#choose-an-appropriate-license), and [contribution guidelines](https://github.com/sindresorhus/awesome/blob/master/awesome.md#include-contribution-guidelines). Adding a [code of conduct](http://contributor-covenant.org/) is also strongly recommended.
+- Wait at least a couple of weeks after creating a list before submitting to this list to give it a chance to mature.
 - Make sure you read the [contribution guidelines](https://github.com/sindresorhus/awesome/blob/master/contributing.md) before submitting a request for your list to be added here.
 
 Thanks for being awesome!

readme.md

@@ -8,11 +8,16 @@
 
 > A curated list of awesome lists
 
-[What makes for an awesome list?](awesome.md)
+- [What is an awesome list?](awesome.md)
+- [Contribution guide](contributing.md)
+- [Creating a list](create-list.md)
+- [Buy a sticker](https://www.stickermule.com/marketplace/10034-awesome)
 
-Please read the [contribution guidelines](contributing.md) or the [creating a list guide](create-list.md) if you want to contribute.
+[![Awesome chat](https://badges.gitter.im/sindresorhus/awesome.svg)](https://gitter.im/sindresorhus/awesome)
 
-**Check out my [blog](https://blog.sindresorhus.com) 🦄 or say *hi* on [Twitter](https://twitter.com/sindresorhus).**
+-
+
+Check out my [blog](https://blog.sindresorhus.com) and follow me on [Twitter](https://twitter.com/sindresorhus).
 
 
 ## Table of Contents
@@ -30,7 +35,7 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [Development Environment](#development-environment)
 - [Entertainment](#entertainment)
 - [Databases](#databases)
-- [Resources](#resources)
+- [Media](#media)
 - [Learn](#learn)
 - [Security](#security)
 - [Miscellaneous](#miscellaneous)
@@ -48,6 +53,7 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [React Native](https://github.com/jondot/awesome-react-native)
 - [Xamarin](https://github.com/benoitjadinon/awesome-xamarin)
 - [Linux](https://github.com/aleksandar-todorovic/awesome-linux)
+    - [Containers](https://github.com/Friz-zy/awesome-linux-containers)
 - [OS X](https://github.com/iCHAIT/awesome-osx)
 	- [Command-Line](https://github.com/herrbischoff/awesome-osx-command-line)
 	- [Screensavers](https://github.com/aharris88/awesome-osx-screensavers)
@@ -65,6 +71,9 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [JavaScript](https://github.com/sorrycc/awesome-javascript)
 	- [Promises](https://github.com/wbinnssmith/awesome-promises)
 	- [Network Layer](https://github.com/Kikobeats/awesome-network-js)
+	- [Standard Style](https://github.com/feross/awesome-standard)
+	- [Must Watch Talks](https://github.com/bolshchikov/js-must-watch)
+	- [Tips](https://github.com/loverajoel/jstips)
 - [Swift](https://github.com/matteocrippa/awesome-swift)
 	- [Education](https://github.com/hsavit1/Awesome-Swift-Education)
 - [Python](https://github.com/vinta/awesome-python)
@@ -106,11 +115,13 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 
 ## Front-end Development
 
-- [JavaScript Must Watch Talks](https://github.com/bolshchikov/js-must-watch)
 - [ES6 Tools](https://github.com/addyosmani/es6-tools)
 - [Web Performance Optimization](https://github.com/davidsonfellipe/awesome-wpo)
 - [Web Tools](https://github.com/lvwzhen/tools)
-- [Critical-Path (Above-the-fold) CSS Tools](https://github.com/addyosmani/critical-path-css-tools)
+- [CSS](https://github.com/sotayamashita/awesome-css)
+	- [Critical-Path (Above-the-fold) Tools](https://github.com/addyosmani/critical-path-css-tools)
+	- [Scalability](https://github.com/davidtheclark/scalable-css-reading-list)
+	- [Must-Watch Talks](https://github.com/AllThingsSmitty/must-watch-css)
 - [React](https://github.com/enaqx/awesome-react)
 - [Web Components](https://github.com/mateusortiz/webcomponents-the-right-way)
 - [Polymer](https://github.com/Granze/awesome-polymer)
@@ -126,21 +137,22 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [Ember](https://github.com/nmec/awesome-ember)
 - [Android UI](https://github.com/wasabeef/awesome-android-ui)
 - [iOS UI](https://github.com/cjwirth/awesome-ios-ui)
-- [Scalable CSS](https://github.com/davidtheclark/scalable-css-reading-list)
 - [Meteor](https://github.com/Urigo/awesome-meteor)
 - [BEM](https://github.com/sturobson/BEM-resources)
-- [CSS Must-Watch Talks](https://github.com/AllThingsSmitty/must-watch-css)
 - [Flexbox](https://github.com/afonsopacifer/awesome-flexbox)
 - [Web Typography](https://github.com/deanhume/typography)
 - [Web Accessibility](https://github.com/brunopulis/awesome-a11y)
 - [Material Design](https://github.com/sachin1092/awesome-material)
-- [CSS](https://github.com/sotayamashita/awesome-css)
 - [D3](https://github.com/wbkd/awesome-d3)
 - [Emails](https://github.com/jonathandion/awesome-emails)
 - [jQuery](https://github.com/peterkokot/awesome-jquery)
 - [Web Audio](https://github.com/notthetup/awesome-webaudio)
 - [Offline-First](https://github.com/pazguille/offline-first)
 - [Static Website Services](https://github.com/aharris88/awesome-static-website-services)
+- [A-Frame VR](https://github.com/aframevr/awesome-aframe) *(Virtual reality)*
+- [Cycle.js](https://github.com/vic/awesome-cyclejs)
+- [Motion UI Design](https://github.com/fliptheweb/motion-ui-design)
+- [Vue.js](https://github.com/vuejs/awesome-vue)
 
 
 ## Back-end Development
@@ -152,10 +164,11 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [Pyramid](https://github.com/uralbash/awesome-pyramid)
 - [Play1 Framework](https://github.com/PerfectCarl/awesome-play1)
 - [CakePHP](https://github.com/friendsofcake/awesome-cakephp)
-- [Symfony2](https://github.com/EmanueleMinotto/awesome-symfony2)
+- [Symfony](https://github.com/sitepoint/awesome-symfony)
 - [Laravel](https://github.com/chiraggude/awesome-laravel)
+    - [Education](https://github.com/fukuball/Awesome-Laravel-Education/blob/master/langs/en_US.md)
 - [Rails](https://github.com/ekremkaraca/awesome-rails)
-- [Rails Gem](https://github.com/hothero/awesome-rails-gem)
+	- [Gems](https://github.com/hothero/awesome-rails-gem)
 - [Phalcon](https://github.com/sergeyklay/awesome-phalcon)
 - [Useful `.htaccess` Snippets](https://github.com/phanan/htaccess)
 - [nginx](https://github.com/fcambus/nginx-resources)
@@ -177,6 +190,7 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [Deep Vision](https://github.com/kjw0612/awesome-deep-vision)
 - [Open Source Society University](https://github.com/open-source-society/computer-science)
 - [Functional Programming](https://github.com/lucasviola/awesome-functional-programming)
+- [Static Analysis & Code Quality](https://github.com/mre/awesome-static-analysis)
 
 
 ## Big Data
@@ -211,7 +225,7 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 ## Editors
 
 - [Sublime Text](https://github.com/dreikanter/sublime-bookmarks)
-- [Vim](http://vimawesome.com)
+- [Vim](https://github.com/mhinz/vim-galore)
 - [Emacs](https://github.com/emacs-tw/awesome-emacs)
 - [Atom](https://github.com/mehcode/awesome-atom)
 
@@ -224,6 +238,7 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [Open Source Games](https://github.com/leereilly/games)
 - [Unity](https://github.com/RyanNielson/awesome-unity) *(Game engine)*
 - [Chess](https://github.com/hkirat/awesome-chess)
+- [LÖVE](https://github.com/JanWerder/awesome-love2d) *(Game engine)*
 
 
 ## Development Environment
@@ -234,7 +249,9 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [Shell](https://github.com/alebcay/awesome-shell)
 - [Command-Line Apps](https://github.com/aharris88/awesome-cli-apps)
 - [ZSH Plugins](https://github.com/unixorn/awesome-zsh-plugins)
-- [Browser Extensions for GitHub](https://github.com/stefanbuck/awesome-browser-extensions-for-github)
+- [GitHub](https://github.com/phillipadsmith/awesome-github)
+    - [Browser Extensions](https://github.com/stefanbuck/awesome-browser-extensions-for-github)
+    - [Cheat Sheet](https://github.com/tiimgreen/github-cheat-sheet)
 - [Git Cheat Sheet](https://github.com/arslanbilal/git-cheat-sheet)
 - [Git Tips](https://github.com/git-tips/tips)
 - [Git Add-ons](https://github.com/stevemao/awesome-git-addons)
@@ -255,15 +272,17 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [SQLAlchemy](https://github.com/dahlia/awesome-sqlalchemy)
 - [InfluxDB](https://github.com/mark-rushakoff/awesome-influxdb)
 - [Neo4j](https://github.com/GraphGeeks/awesome-neo4j)
+- [Doctrine](https://github.com/TomasVotruba/awesome-doctrine) *(PHP ORM)*
 
 
-## Resources
+## Media
 
 - [Creative Commons Media](https://github.com/shime/creative-commons-media)
-- [Images](https://github.com/heyalexej/awesome-images)
 - [Fonts](https://github.com/brabadu/awesome-fonts)
 - [Codeface](https://github.com/chrissimpkins/codeface) *(Text editor fonts)*
 - [Stock Resources](https://github.com/neutraltone/awesome-stock-resources)
+- [GIF](https://github.com/ibaaj/awesome-gif)
+- [Music](https://github.com/ciconia/awesome-music)
 
 
 ## Learn
@@ -279,7 +298,7 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 
 - [Application Security](https://github.com/paragonie/awesome-appsec)
 - [Security](https://github.com/sbilly/awesome-security)
-- [CTF](https://github.com/apsdehal/awesome-ctf)
+- [CTF](https://github.com/apsdehal/awesome-ctf) *(Capture the Flag)*
 - [Malware Analysis](https://github.com/rshipp/awesome-malware-analysis)
 - [Android Security](https://github.com/ashishb/android-security-awesome)
 - [Hacking](https://github.com/carpedm20/awesome-hacking)
@@ -292,6 +311,7 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [JSON](https://github.com/burningtree/awesome-json)
 - [Discounts for Student Developers](https://github.com/najela/discount-for-student-dev)
 - [Slack](https://github.com/matiassingers/awesome-slack)
+    - [Communities](https://github.com/filipelinhares/awesome-slack)
 - [Conferences](https://github.com/RichardLitt/awesome-conferences)
 - [GeoJSON](https://github.com/tmcw/awesome-geojson)
 - [Sysadmin](https://github.com/n1trux/awesome-sysadmin)
@@ -299,12 +319,10 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [Awesome](https://github.com/sindresorhus/awesome)
 - [Analytics](https://github.com/onurakpolat/awesome-analytics)
 - [FOSS for Developers](https://github.com/httpsGithubParty/FOSS-for-Dev)
-- [GitHub Cheat Sheet](https://github.com/tiimgreen/github-cheat-sheet)
 - [Open Companies](https://github.com/opencompany/awesome-open-company)
 - [REST](https://github.com/marmelab/awesome-rest)
 - [Selenium](https://github.com/christian-bromann/awesome-selenium)
 - [Endangered Languages](https://github.com/RichardLitt/endangered-languages)
-- [Slack Communities](https://github.com/filipelinhares/awesome-slack)
 - [Continuous Delivery](https://github.com/ciandcd/awesome-ciandcd)
 - [Services Engineering](https://github.com/mmcgrana/services-engineering)
 - [Free for Developers](https://github.com/ripienaar/free-for-dev)
@@ -326,11 +344,9 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [FOSS Production Apps](https://github.com/jwaterfaucett/awesome-foss-apps)
 - [Gulp](https://github.com/alferov/awesome-gulp)
 - [AMA](https://github.com/sindresorhus/amas) *(Ask Me Anything)*
-- [AMA-answers](https://github.com/stoeffel/awesome-ama-answers)
+	- [Answers](https://github.com/stoeffel/awesome-ama-answers)
-- [GIF](https://github.com/ibaaj/awesome-gif)
 - [Open Source Photography](https://github.com/ibaaj/awesome-OpenSourcePhotography/)
 - [OpenGL](https://github.com/eug/awesome-opengl)
-- [JavaScript Standard Style](https://github.com/feross/awesome-standard)
 - [Productivity](https://github.com/jyguyomarch/awesome-productivity)
 - [GraphQL](https://github.com/chentsulin/awesome-graphql)
 - [Transit](https://github.com/luqmaan/awesome-transit)
@@ -340,22 +356,23 @@ Please read the [contribution guidelines](contributing.md) or the [creating a li
 - [Social Media Share Links](https://github.com/vinkla/share-links)
 - [JSON Datasets](https://github.com/jdorfman/awesome-json-datasets)
 - [Microservices](https://github.com/mfornos/awesome-microservices)
-- [GitHub](https://github.com/phillipadsmith/awesome-github)
 - [Unicode Code Points](https://github.com/Codepoints/awesome-codepoints)
 - [Internet of Things](https://github.com/HQarroum/awesome-iot)
 - [Open Source Documents](https://github.com/nacyot/awesome-opensource-documents)
 - [Umbraco](https://github.com/leekelleher/awesome-umbraco)
-- [Linux Containers](https://github.com/Friz-zy/awesome-linux-containers)
 - [Beginner-Friendly Projects](https://github.com/MunGell/awesome-for-beginners)
 - [Bluetooth Beacons](https://github.com/beaconinside/awesome-beacon)
 - [Spanish Natural Language Processing (NLP)](https://github.com/dav009/awesome-spanish-nlp)
 - [Programming Interviews](https://github.com/MaximAbramchuck/awesome-interviews)
-- [Music](https://github.com/ciconia/awesome-music)
 - [Ripple](https://github.com/vhpoet/awesome-ripple) *(Open-source distributed settlement network)*
 - [Katas](https://github.com/gmontalvoriv/awesome-katas)
 - [Tools for Activism](https://github.com/drewrwilson/toolsforactivism)
 - [TAP](https://github.com/sindresorhus/awesome-tap) *(Test Anything Protocol)*
 - [Robotics](https://github.com/Kiloreux/awesome-robotics)
+- [MQTT](https://github.com/hobbyquaker/awesome-mqtt) *(an "Internet of Things" connectivity protocol)*
+- [Hacking Spots](https://github.com/diasdavid/awesome-hacking-spots)
+- [For Girls](https://github.com/cristianoliveira/awesome4girls)
+- [Vorpal](https://github.com/vorpaljs/awesome-vorpal) *(Node.js CLI framework)*
 
 
 ## License