Updaed some files and the assignments for 2015
Merge branch 'master' of https://github.com/RobHayward/EC387