added temporary map button
slight change to filter p.emojis
small change to background colour of d.emojis
Merge branch 'master' of https://github.com/calimcginley/emo_app

Conflicts:
	public_html/index.html