git magick
some leftovers
CRs in index still
some reversions fixed
Merge branch 'master' of https://github.com/walkerart/infolounge_walls

Conflicts:
	sass/screen.scss
Merge branch 'master' of https://github.com/walkerart/infolounge_walls
clean up conflicts
start of templates
switch to on click
working lightbox
merge
missed one
colorbox style
lightbox stuff
timeout tombstone fade
more
more
more
working templates
Merge branch 'master' of https://github.com/walkerart/infolounge_walls

Conflicts:
	index.html
	stylesheets/screen.css