tried and failed to set up infinite scrolling, edited profile page and implemented a sticky nav bar.
removed my attempt at tag cloud
Merge branch 'master' of github.com:zhbanton/photo_mixer into slider

Conflicts:
	app/assets/javascripts/main.js
	app/views/layouts/application.html.erb
removed sticky class on filter button
Merge pull request #49 from zhbanton/slider

Slider