modified gitignore
Merge branch 'dev' of https://github.com/lalezaris/Android-Sample into dev

Conflicts:
	FragmentTest/gen/android/support/v7/appcompat/R.java
	FragmentTest/gen/edu/wpi/cs/fragmenttest/R.java