Merge branch 'master' of ../workspace

Conflicts: .metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources .metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi .metadata/.plugins/org.eclipse.jdt.core/1375964667.index .metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps .metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

Merge branch 'master' of ../workspace
6905c96e · Siyu Lin · 0bec7bd9 · b6515daf · 6905c96e · 6905c96e
Commit 6905c96e authored 10 years ago by Siyu Lin
--- a/project5/bin/.gitignore
+++ b/project5/bin/.gitignore
--- a/project7/bin/.gitignore
+++ b/project7/bin/.gitignore
--- a/temp/.gitignore
+++ b/temp/.gitignore