fix stuff
gitignore stuff
Merge branch 'master' of https://github.com/JSteveNunez/RacingRivalz

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/JSteveNunez/RacingRivalz

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/JSteveNunez/RacingRivalz

Conflicts:
	mobile/src/main/java/racingrivals/artoos/com/racingrivals/listener/WearListener.java