Added about page+change maps
Merge branch 'master' of github.com:janastu/dasara-prototype

Conflicts:
	index.html
Merge branch 'master' of github.com:janastu/dasara-prototype
lightbox colors change