committing this just because I need to in order to pull changes from remote
Merge branch 'flatdesign' of github.com:uwmadisoncals/calsmain-calsACS-IT into flatdesign
Changing the files back to mode 775