post implementation
Merge branch 'master' of https://github.com/ksmutny/coding-dojo-dec13

Conflicts:
	src/main/scala/articles/Article.scala