Lorem ipsum
Merge remote-tracking branch 'origin/feature/loremipsum'

Conflicts:
	src/main/java/se/antongomes/pvt/view/HomePage.html