gif view files unfinished
Merge branch 'master' of github.com:econnors/gifinator

Conflicts:
	log/development.log
	tmp/pids/server.pid