First pages commit
Merge
Fix base url issue
Change nav urls
Remove erb files
Remove
cha-cha-changes