Minor changes.
Merge branch 'master' of github.com:kallaspriit/APP5
Minor changes.
Merge branch 'master' of github.com:kallaspriit/APP5

Conflicts:
	.gitignore
Started using boostrap AngularUI.