.gitignore created by brackets-git extension
Merge branch 'master' of https://github.com/alexgrande/main