testing gif
Merge branch 'master' of https://github.com/evanschris/dat-degree-show-2014

Conflicts:
	web/resources/js/main.js
Merge branch 'master' of https://github.com/evanschris/dat-degree-show-2014