11/25/2014 complete all required functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	cs445_project/.classpath
	cs445_project/.project
	cs445_project/.settings/org.eclipse.jdt.core.prefs
	cs445_project/cs445_project/.gitignore
	cs445_project/cs445_project/Bakery.java
	cs445_project/cs445_project/Main.java
	cs445_project/cs445_project/Product.java
	cs445_project/cs445_project/Recipe.java
	cs445_project/cs445_project/Subscriber.java
	cs445_project/cs445_project/Subscription.java