initialized
gitignore added
Merge branch 'master' of https://github.com/pazooki/noggin

Conflicts:
	.gitignore
resolved