updated gitignore
merging
Merge branch 'master' of https://github.com/thinkpad20/synesthesia
merged