Updated
Merge branch 'master' of https://github.com/ronnieholm/Backend-web-programming-course-spring-2014