Here goes
Merge branch 'master' of https://github.com/biggerfisch/mhacks-fall13
Stuff
Merge branch 'master' of https://github.com/biggerfisch/mhacks-fall13

Conflicts:
	chord_generator.py