Issue - 157 - Combine front-end and back-end server.
Merge pull request #158 from john29917958/john-patch

Issue - 157 - Combine front-end and back-end server.