-Added all of the changes I have been making for the past 4 weeks
Merge branch 'master' of https://github.com/iomekam/GTSafe

Conflicts:
	GTSafe/res/layout/activity_main.xml
	GTSafe/res/values/strings.xml
	GTSafe/src/com/example/gtsafe/CrimeLogActivity.java
	GTSafe/src/com/example/gtsafe/MainActivity.java