merged and fixed master
merged master in
merge conflict in ab.js
add mediator to ab.js
fixed merge conflict
Merge remote-tracking branch 'origin/master' into gravity-populate-righthand-component
implement gravity tracking
merged from origin/master
Manufacture right hand components in a factory
create right hand component factory in bootstrap
Merge remote-tracking branch 'origin/master' into gravity-populate-righthand-component
tried to do some javascript inheritance. Failled
Merge remote-tracking branch 'origin/master' into gravity-populate-righthand-component
deleted extraneous cookie class
removed unneeded css
run the test for two weeks
removed errouneous whitespace
Merge remote-tracking branch 'origin/master' into gravity-populate-righthand-component
fix pull request issues
Merge remote-tracking branch 'origin/master' into gravity-populate-righthand-component