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
no message
Merge branch 'FinalDemo' of https://github.com/404Tracker/ChefNetwork into FinalDemo

Conflicts:
	.gradle/2.2.1/taskArtifacts/cache.properties
	.gradle/2.2.1/taskArtifacts/cache.properties.lock
	.gradle/2.2.1/taskArtifacts/fileHashes.bin
	.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.2.1/taskArtifacts/outputFileStates.bin
	.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
	.idea/misc.xml
	ChefNetwork.iml
	app/app.iml
	app/src/main/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
no message
Restoring missed classes
Restoring missed classes
no message
Merge remote-tracking branch 'origin/FinalDemo' into FinalDemo
Rounded Bitmaps have been added
no message
Merge branch 'FinalDemo' of https://github.com/404Tracker/ChefNetwork into FinalDemo
Log Register Layout Changes, ICON added
Recipe Thumbnail Edited, Viewing thumbnail edited in ViewProfile & Explore
Make PDF deleted, LogOut edited
Force push