Refactor code completely
Update readme for v2.0
Merge branch 'master' of https://github.com/iamarcel/tjoektjoek

Conflicts:
	app/scripts/new.js