Lots of progress, working lists
merging

Merge branch 'master' of https://github.com/jdingus/Bicycle_Model

Conflicts:
	bicycle.py