Hibernate works again
Merge branch 'master' of github.com:vegarang/the_academy
Merge branch 'master' of github.com:vegarang/the_academy
got webservice up and running
Merge branch 'master' of github.com:vegarang/the_academy