Fillin shit in ahhh yeah
Merge branch 'master' of https://github.com/LeJit/EveryoneHacksCHI

Conflicts:
	.DS_Store
	bootstrap/.DS_Store