update
Merge branch 'master' of github.com:billyrennekamp/fitness_for_artists
Merge branch 'master' of github.com:billyrennekamp/fitness_for_artists
htaccess