test commit
test commit back
test 2 back
last testing commit
Updated .gitignore so hopefully the two IDEs will stop fighting
done testing commits between devices.
I dislike how R.java doesn't seem to be ignored.
playing with .gitignore

to get it to ignore R.java and .idea/*/workspace.xml
Revert "playing with .gitignore"

This reverts commit 1f9ac35a8479f869309da6894df3a5f38f3b38cf.
Everything seems to be working properly
Merge pull request #2 from Nret/changes

Changes
Merge pull request #3 from Nret/fixes

Fixes