Updated gitignore with R.java
no message
Merge branch 'master' of https://github.com/RazielZ/NCITNXT

Conflicts:
	gen/com/ncit/nxt/R.java