Changed app.html with junk
Added Branch fix20
Change comment in app.js, again
added hot fix
Merge branch 'fix21'

Conflicts:
	template/app.js
Added branch fix20
Change comment to 3
Added hotfix
Merge branch 'fix21'

Conflicts:
	template/app.html