Added R.java (autogen file) to gitignore
Merge branch 'master' of github.com:ndm25/EECS314
Adding /gen to gitignore