image popup, search results nicer.
Merge branch 'master' of github.com:soad003/flatman

Conflicts:
	app/assets/stylesheets/flatman.css.scss