started agrregate smaller chunks of pie chart
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm
 started adding viewing controls
merged conflits
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm
user login bug fixed
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm