second commit
extensions
second commit
Merge branch 'master' of github.com:amirkoklan/hollywood

Conflicts:
	.gitignore
Merge branch 'master' of github.com:amirkoklan/hollywood
removing conflicts
Conflicts:
	.gitignore