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
Merge pull request #4 from jlshingler/master

added star
New pop up style
some js files added
conflicts resolved
conflicts resolved
aslyn updates
new pop up window functionality
Conflicts resolved
Merge pull request #7 from otorres86/master

pop up window displays all info
Updated things
Merge branch 'master' of https://github.com/jeche/dehackathon2