ionic .gitignore
Merge branch 'master' of https://github.com/acr13/ionic-task-list

Conflicts:
	.gitignore