update gitignore
Merge branch 'dev' of https://github.com/readitlive/client into dev

Conflicts:
	.gitignore