Just doin ma thing
Merge https://github.com/karcaw/cpts224_2014 into JorgeDiaz

Conflicts:
	run
Merge branch 'master' of https://github.com/karcaw/cpts224_2014