a.subdued css
Merge branch 'master' of https://github.com/driftyco/ionic

Conflicts:
	scss/_type.scss