hahahahahahha3.
Merge branch 'master' of github.com:jennyChing/TryTalk

Conflicts:
	views/front_layout.jade