couple changes from video
Merge branch 'master' of https://github.com/mem-comp4081-2014fall/mud

Conflicts:
	db/development.sqlite3
merging final changes

Merge branch 'master' of https://github.com/mem-comp4081-2014fall/mud

Conflicts:
	db/development.sqlite3