add assets
Merge branch 'master' of github.com:aaronsamuel137/yoganow-rails

Conflicts:
	public/assets/manifest-0949c5b82dfa66454dd65bf03d92ed4a.json