this is a test commit
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
added gititgnore
this is a test message
Merge branch 'master' of github.com:the-hobbes/softwareEngineeringFinalProject
Merge branch 'dev' of github.com:the-hobbes/softwareEngineeringFinalProject into dev
Removed old java bits from ignore file