Merge branch 'master' of https://github.com/jamalomartin/

Conflicts:
.gitignore