This is the first commit for the study guide android app
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore