updated favicon and layout
Merge branch 'master' of github.com:rzhou186/tunetheair

Conflicts:
	public/javascripts/main.js