Merge branch 'master' of https://github.com/NearlyJen/Courses
should fix for merge
Conflicts:
	app/assets/stylesheets/course_card.css.scss
fixed up gitignore
Merge branch 'master' of https://github.com/NearlyJen/Courses