Closes #140 - Swap  with oboe implementation
Merge pull request #143 from polynickglot/master

Closes #140 - Swap  with oboe implementation
Fix merge conflicts
Merge branch 'xue0chao-master'
Merge pull request #144 from polynickglot/master

Clock now works - Fix merge conflicts
Remove no longer used file
Merge pull request #145 from polynickglot/master

Remove no longer used file
change inputs to buttons and set width of drop-down to 250px
Merge pull request #147 from mattphoto/master

change inputs to buttons and set width of drop-down to 250px
remove sign in / sign up html partial views that are no longer used.
typo
Add site url to readme
Merge pull request #149 from mattphoto/master

remove sign in / sign up html partial views that are no longer used.
Add indentation
Add x and y axes to Rickshaw graphs
Merge pull request #152 from polynickglot/master

Closes #148 - Add axes to graphs
remove footer form index.html and css from style.css
removed 40px style from body in style.css
Merge pull request #163 from mattphoto/master

remove footer from index.html and related css from style.css
Added server route for new chart data