Change title of home page
Removed date from body
Title change for feature
Change font to 60px default
Change font to ems
Merge branch 'feature-john'

Conflicts:
	styles.css
A random change of 10616 to test1.txt
A random change of 12349 to test2.txt
A random change of 32709 to test3.txt
Merge branch 'ff'