added font awesome
updated map with vanah's changes
git ignore
css changes merge branch 'css'

Conflicts:
	.gitignore
	www/css/index.css