Added parse
Updated database
Modified gitignore
Merge branch 'master' of https://github.com/crunchbang/Takshak