first commit
nada working
changes?
Merge branch 'master' of https://github.com/jennypullman/chimein
lydia's changes
merged stuff at 10:39