Update gitignore
Merge branch 'master' of https://github.com/leoman/angularBlog

Conflicts:
	.DS_Store
	.gitignore