working on merging views
Merge branch 'master' into merged_2
josh merged in
styling
Merge branch 'merged_2' of github.com:JoshuaDickerson/hackvt-2014

Conflicts:
	maptest.html
Fixed leftover git tag.