add timeShift controls
Merge pull request #66 from xue0chao/master

Added front-end functionality to get data from node
Remove gulpfile.js from concat task
New concat file
Merge pull request #68 from xue0chao/master

Trying to connect to MSSQL Server
Added bootstrap
Merge pull request #69 from radicalsauce/master

Added bootstrap
Added jQuery
Merge pull request #70 from radicalsauce/master

Added jQuery
Add gulp clean and new concat file
Merge pull request #67 from polynickglot/master

Update concat in gulp
Fix merge conflicts
Change conflict again to make it look more like original
Merge branch 'mattphoto-master'
Merge pull request #71 from polynickglot/master

Fix merge conflicts for timeShift controls
Fix linting errors in timeShift.js
Merge pull request #72 from polynickglot/master

Fix linting errors in timeShift.js
Remove exit on end from mochaTest and add comments
Merge pull request #73 from polynickglot/master

Remove exit on end from mochaTest and add comments
Update deprecated express function (send -> sendStatus)