output jade
Merge branch 'master' of github.com:MattAttack/hacktx14-fb-user-modeling

Conflicts:
	views/index.jade