fixing tracked files
Merge branch 'master' of github.com:Alfwich/fall2014
4 work