Gregory

Herro
Merge remote-tracking branch 'origin/master'

Conflicts:
	slaveapp/slaveapp.sdf
	slaveapp/slaveapp.v12.suo
Merge branch 'master' of https://github.com/paradc2/tunesquad