suck it
Merge branch 'master' of github.com:Datise/git-mania

Conflicts:
	.DS_Store