Initial commit
initial commit
Merge branch 'master' of https://github.com/cpreston/FragmentTestProject
??
fixing .gitignore
Updated to Android Studio 0.3.2
Updated to Android Studio 0.3.2
Merge branch 'master' of https://github.com/cpreston/FragmentTest

Conflicts:
	README.md