added my name and a bit about myself
Merge branch 'master' of https://github.com/karcaw/cpts224_2014

Conflicts:
	run