Last bloody time I fix your names and removing ~ files, get your stuff together!
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014
Program doesn't work for 017, rework project laster
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014
Some more ~ files killed!
Merge branch 'master' of https://github.com/thebravoman/software_engineering_2014