Arav-Agarwal ecb8ebae64 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	client/main/main.js

2016-08-29 23:18:22 -04:00

..

main.css

Display who's done, fixed #46

2016-08-28 18:55:10 -04:00

main.html

Fixed minor bugs

2016-08-28 23:25:43 -04:00

main.js

Merge remote-tracking branch 'origin/master'

2016-08-29 23:18:22 -04:00