working templates
Merge branch 'master' of https://github.com/walkerart/infolounge_walls

Conflicts:
	index.html
	stylesheets/screen.css