fixing the gitignore
Merge pull request #43 from thimes/fixGitIgnore

fixing the gitignore
Merge remote-tracking branch 'origin/master' into fix-drawer-on-orientation-change

Conflicts:
	library/library.iml
	sample/sample.iml