Merge pull request #1 from otorres86/master

new UI work
test for joanna
new map

map with extra border at bottom for buttons
text screens

screens for use in title and finish screen (to coordinate with map)
Sticky moves!
Merge branch 'master' of https://github.com/jeche/dehackathon2
Merge pull request #2 from Sara-lily/master

Sticky moves!
Merge branch 'master' of https://github.com/jeche/dehackathon2

Conflicts:
	views/index.html