Merge pull request #153 from Sue-Yi-FAN/master

real data in database
Issue 154 Bug - fixed the front-end package.json error
Merge pull request #155 from Chiene/master

Issue 154 Bug - fixed the front-end package.json error
Merge pull request #156 from Sue-Yi-FAN/master

update database
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.
Merge branch 'master' of github.com:evanxd/travis-reporter

Conflicts:
	resources/database/local.0
	resources/database/local.ns
	resources/database/mongod.lock
remove mongod.lock
move back-end into front-end and rename server