Fun test
Merge branch 'master' of https://github.com/driftyco/ionic

Conflicts:
	js/ext/angular/test/content.html