none
Merge branch 'master' of https://github.com/eljanuari/Pinsil-Scrum

Conflicts:
	public/index.html