ionic init
Merge branch 'master' of github.com:bricedurand/slackline

Conflicts:
	README.md