Adding gitignore file back in
Merge branch 'master' of github.com:liveondev/liveon-web

Conflicts:
	.gitignore
Merge branch 'master' of github.com:liveondev/liveon-web
Adding Narration
Merge branch 'narration'

Conflicts:
	.gitignore