test
Merge branch 'master' of ssh://git@github.com/stjernstedt/blog-projekt.git
Test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Blog/src/data/Post.java
	BlogClient/src/client/Client.java