a
:wq
wq
wq
qMerge branch 'master' of github.com:jackdeadman/hackathon

Conflicts:
	README