Merge branch 'master' into rissa

Conflicts:
	app/views/TAbout_jacob.blade.php
	app/views/TAbout_jill.blade.php
	app/views/TAbout_rissa.blade.php
	app/views/TAcontactus.blade.php
	app/views/TAhome.blade.php
	app/views/TAwesome.blade.php