fixed line
fixed conflicts in View
some changes, not sure what
fixed conflicts
Merge branch 'master' of https://github.com/cstuart1021/11.127-Digital-Game
Merge branch 'master' of https://github.com/cstuart1021/11.127-Digital-Game
added images