Added a server
Merge branch 'master' of https://github.com/jj-macks/along-the-way

Merged local with master to include server.