Solution
Merge branch 'solution-1' of github.com:sf-wdi-15/omdb_in_class into solution-1

Conflicts:
	index.js
	views/results.ejs
Small, cosmetic updates to solution-