Merge pull request #94 from blind-squirrel/alex

Alex
Merge pull request #95 from blind-squirrel/alex

fixed login infoormation
Fixed config.
Merge pull request #96 from blind-squirrel/Sharon

Fixed config.
Added a slash to keep the routes consistent
work-around for local-name
change to local environment
fixing local environment
Initial commit of moment.js
Merge pull request #97 from blind-squirrel/Sharon

Sharon
Merge branch 'master' into alex
Added space to force commit