Deleted old files
Merge branch 'refs/heads/lars'
test
Readme to master commit test
Merge branch 'master' of https://github.com/Sin-limites/webapp

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master' into axel