made some important changes
Merge pull request #1 from CST316GroupO/master

made some important changes
Commiting gabe's changes??

I dont fucking know
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/libraries/Gradle__ComAndroidSupportAppcompatV71900_aar.xml
	.idea/misc.xml
	gradle/wrapper/gradle-wrapper.properties
Removing files for .gitignore
Removing more for .gitignore
Removing unnecessary android studio items
Fixing for .gitignore
Adding to .gitignore
adding to .gitignore
Fixing git error
Merge pull request #1 from brantunger/master

Removing Junk
Merge pull request #1 from CST316GroupO/master

Updating to Junk-less copy of repository