Project created. Generated controller and view
Merge branch 'develop'

Conflicts:
	.gitignore