Add some files to .gitignore
Merge branch 'master' of https://github.com/sparklystar/Photo-Sensitivity

Conflicts:
	PhotoSensitivity/bin/classes.dex

PhotoSensitivity/bin/classes/fi/slapps/photosensitivity/MainActivity.cla
ss
Ignore files and resolve conflicts