changed .gitignore to ignore R.java and BuildConfig.java
Merge branch 'master' of https://github.com/szhou1/uFit.git
committing .gitignore