Fixed gitignore file

Fixed gitignore file
Merge branch 'master' of https://github.com/ryanmurakami/gimmewax

Conflicts:
	.gitignore