hjgjg
kjhgjhg
no message
Merge remote-tracking branch 'origin/FinalDemo-isa' into FinalDemo

Conflicts:
	app/src/main/java/com/example/chef/chefnetwork/ConnectionManager/ConnectionManagerFasade.java
	app/src/main/java/com/example/chef/chefnetwork/ConnectionManager/GlobalVars.java
	app/src/main/java/com/example/chef/chefnetwork/ConnectionManager/MyHttpClient.java
	app/src/main/java/com/example/chef/chefnetwork/Recipe/Dish.java
	app/src/main/java/com/example/chef/chefnetwork/ViewTimeLineActivity.java
Settings.. Account.. have been modified