Merge pull request #31 from CS3141-Fall2013/master

Update Dev