added tiles object
changed auth google
Merge branch 'tiles'

Conflicts:
	views/home.ejs
Merge branch 'master' of https://github.com/asaldivar/polarize

Conflicts:
	public/js/chat.js
	views/home.ejs