lulz

Signed-off-by: Erland <ethna@ethna.se>
Merge branch 'HEAD' of https://github.com/erlandayond/projectplanning.git

Conflicts:
	app/controllers/Application.java
	app/models/ListAPI.java
	app/models/ProjectInfo.java
	app/views/Application/pview1.html

Signed-off-by: Erland <ethna@ethna.se>
Merge branch 'HEAD' of https://github.com/erlandayond/projectplanning.git