no message
Merge branch 'master' of github.com:dansolhan/software-security-tdt4237-webapp into dansolhan-master

Conflicts:
	README.md
Merge branch 'dansolhan-master'