init commit
updated ignore file
Merge branch 'master' of https://github.com/frontendherodk/rocket

Conflicts:
	.gitignore