midd video stuff
Merge branch 'master' of https://github.com/walkerart/infolounge_walls

Conflicts:
	javascripts/scripts.js
	javascripts/zoom_swipe.js