State at the end of Battle Hack Miami 2013-08-25
Merge remote-tracking branch 'github/master'

Conflicts:
	.gitignore