add gameover screen
add start area image
add action for water and user collision
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	lib/game.rb
deleted image
deleted image
Merge branch 'master' of github.com:m-negishi/RubyCampTeam1

Conflicts:
	images/ending1.png