Merge branch 'master' of https://github.com/ctortman/Good-Ideas-Forever

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/ctortman/Good-Ideas-Forever