test
Merge branch 'dev' of http://github.com/the-hobbes/softwareEngineeringFinalProject into dev

Conflicts:
	README#
Working on storyboarding
Merge branch 'master' of https://github.com/EJEHardenberg/softwareEngineeringFinalProject into dev
started storyboard sketches in photoshop