Versuch, im Develop-branch was zu pushen
Merge branch 'develop' of https://github.com/Jather90/AMOS_proj5 into develop

Conflicts:
	target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
Merge branch 'master' of https://github.com/Jather90/AMOS_proj5 into develop
changed manifest to java 1.7
playing around with googlecharts, created a class to better prepare data for google charts
Example in testFunktionSven.jsp
added more examples
Commit for Changes in Website Display
changed .gitignore
small fixes
added LICENSE.txt
Merge branch 'develop'