Add a whole bunch of insane crap oh god
Merge branch 'master' of github.com:ianweller/quash

Conflicts:
	main.cpp