last commit(hopefully)

all the files I personally worked on are copied in the sid'sfiles folder
Merge branch 'master' of https://github.com/CS-4400-2013/Phase_III