Ignore data
Merge branch 'master' of github.com:harry-m/nhgd13

Conflicts:
	.gitignore
Merge branch 'master' of github.com:harry-m/nhgd13
Courses controller and moved salaries controller to the right place