finally added my stuff
Merge branch 'master' into nickbunn

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