Merge pull request #9 from susieye19/master

Format notes
Add demo account
Add a blank default option for month and year form selections
Merge branch 'master' of https://github.com/susieye19/learnrails into susieye19-master

Conflicts:
	app/assets/stylesheets/chapters.css.scss
	app/assets/stylesheets/custom.css.scss
Add Coderay styles
Update price
Add price discount
Remove discount
Add discount code
Add favicon
Add blog
Merge remote-tracking branch 'upstream/master'