Inital Commit
Merge branch 'master' of github.com:ashish198907/unicorn_app

Conflicts:
	.gitignore