another option
Merge branch 'master' of github.com:3rdcupofjava/timercity.com