end of saturday commit
Merge https://github.com/trivett/trainingwheels into vincent
for demo
delete files
change gem