setting up speaker
Merge branch 'master' of github.com:StephenKoller/mashhopper
merge in some angular changes
Merge branch 'master' of github.com:StephenKoller/mashhopper
Merge branch 'master' of github.com:StephenKoller/mashhopper
Merge branch 'master' of github.com:StephenKoller/mashhopper
how to do mapreduce?
Merge branch 'master' of github.com:StephenKoller/mashhopper
Merge branch 'master' into feature/chart
added chart making
Merge branch 'master' of github.com:StephenKoller/mashhopper
Merge branch 'master' into feature/chart
Merge branch 'feature/chart' into develop