Merge branch 'master' into Generic-CSS
Fixed body cards height, centered twitter feed, limit 3
Updated homepage site text
Merge branch 'Generic-CSS' into Home
Removed page intro animations aside from homepage, finished homepage
Merge branch 'Home'

Conflicts:
	css/css2014.css