Added test.html
Merge branch 'master' of https://github.com/joshuagordon/hackflix_summer_2013

Conflicts:
	test.html
Merge branch 'master' of https://github.com/joshuagordon/hackflix_summer_2013
Added recomendation engine