Local setup
Merge branch 'master' of github.com:TMBR/angelfire
Removed duplicate html folder