Home page changes, About changes

see above
Merge branch 'master' into Lucas-branch

Conflicts:
	PostUpNow/postupnow.pyc
Stuff

Above
Merge
Merge branch 'Lucas-branch'
A change

safsfs