update pages
Merge branch 'master' of https://github.com/myHealthAssistant-tudarmstadt/myhealthassistant-tudarmstadt.github.io

Conflicts:
	index.html
	stylesheets/stylesheet.css