Merge branch 'develop' of github.com:Derkje-J/programming-life into develop
Ignore updated for deliverables
Added hook controller
Added main controller
Removed greetings
Added index action for main controller
Added hook and default routes
Added main index template
Added all default ignores
Added jasmine to gemfile
Installed jasmine
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop

Conflicts:
	.gitignore
Merge branch 'develop' of github.com:Derkje-J/programming-life into develop
Added Jasmine examples
Started document structure for EAD.
Processed feedback and made a LaTex template
Updated EAD to comply with project guidelines and incorporate feedback
Added backbone + dependencies
Added backbone and underscore to default js
Type of the module implemented and tested