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!
Pop up window
Merge branch 'master' of https://github.com/jeche/dehackathon2

Conflicts:
	views/index.html
java script method to allow grabbing cycles
Merge branch 'master' of github.com:jeche/dehackathon2
transparent star

star for finish square
Merge pull request #3 from otorres86/master

Pop up window
Committing apicontroller
testPush
Merge branch 'master' of https://github.com/jeche/dehackathon2