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

# Conflicts:
#	client/main/main.js

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

..

login

Lots of tiny bug fixes, such as display, naming, and functionality

2016-08-27 18:53:47 -04:00

main

Merge remote-tracking branch 'origin/master'

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

profile

serverData make global variable

2016-08-29 21:02:02 -04:00