audio and search
audio and search
motrr images
no message
added locations
changed some locations
changed locations
added tags to json file
audio and search
Merge branch 'master' into shwetha

Conflicts:
	public/pub-mccosh/img.json
tags in img.json
added tags field to img.json files
added .gitignore
Merge branch 'master' into thomas
styled landing page (v1)
fixed typos on landing page and tweaked link styles
started v2 design on tour.html, dummy table of contents on them, made next/prev buttons
changed order
tweaked and cleaned landing page navbar styling on hover and focus
added fontawesome package to meteor, changed tour.html setting to cogs icon