Merge pull request #5 from FriedJam/vik

Added Project Plan docs & populated README.md with key project links
SoftwareEngineeringG02 · Oct 20, 2017 · 020e82d · 020e82d
2 parents ba73bf1 + ae77e42
commit 020e82d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1 +1,22 @@
-# Project01
+# Android GPS App
+
+## GitHub Merge Workflow
+
+![GitHub workflow for the project](/docs/img/github-workflow.png)
+
+## Assignment Documents
+
+- Project Plan: [/docs/Android_App_Project_Plan.docx](/docs/Android_App_Project_Plan.docx)
+- ICM Tracker: [/docs/ICM_Tracker.xlsx](/docs/ICM_Tracker.xlsx)
+
+## Trello Board
+
+[https://trello.com/b/uJQ77sTs/ase-group-2](https://trello.com/b/uJQ77sTs/ase-group-2)
+
+## Google Drive
+
+[https://drive.google.com/drive/folders/0B5BQpSIio7rYcktnUXB6aXNlWDg](https://drive.google.com/drive/folders/0B5BQpSIio7rYcktnUXB6aXNlWDg)
+
+## Semantic Versioning
+
+[http://semver.org/](http://semver.org/)
diff --git a/docs/Android_App_Project_Plan.docx b/docs/Android_App_Project_Plan.docx
diff --git a/docs/ICM_Tracker.xlsx b/docs/ICM_Tracker.xlsx
diff --git a/docs/img/github-workflow.png b/docs/img/github-workflow.png