4 work. combine.py small change to inital output
Merge branch 'master' of github.com:Alfwich/fall2014
Merge branch 'master' of github.com:Alfwich/fall2014
4work