remove haha hoho
remove .gitignore
Merge branch 'master' into redgoose

Conflicts:
	.gitignore