- Updated gitignore to ignore .idea folder
lkmlmk
Merge branch 'master' of https://github.com/adfleshner/W_H_Reader

Conflicts:
	.idea/gradle.xml
	.idea/modules.xml
	.idea/workspace.xml
	app/app.iml
	app/build.gradle