init
Merge branch 'master' of github.com:Programvaresikkerhet/Bookstore

Conflicts:
	.gitignore
	WebContent/viewBook.jsp
	src/amu/action/ViewBookAction.java
Merge