conflict
Merge branch 'master' of https://github.com/Dwarakeshtv/Evernote

Conflicts:
	gitignore.txt