Inital commit
Merge branch 'master' of https://github.com/Ssitha/demo_app

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Ssitha/demo_app

Conflicts:
	.gitignore