Merge pull request #65 from gregburton/master

Discover page up and running, connects to all APIs
small update to animation
merge conflict
a few basic responsive design touches to the homepage
Merge pull request #66 from dheckman/master

a few basic responsive design touches to the homepage
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/home/index.html.erb