One of the final commits for version 1.0

One more commit in the morning that will add an angular.js search
feature, and improved card details.
Merge branch 'master' of https://github.com/morganjohn12/Facebook_Recommend

Conflicts:
	f-recommend/WebContent/WEB-INF/lib/jstl-1.2.jar
	f-recommend/WebContent/index.jsp
	f-recommend/build/classes/calculate/calculate.class
	f-recommend/src/calculate/calculate.java
	f-recommend/src/calculate/myObject.java