Commit of files after computer issues on 04/10/14
Merge branch '140410_Day4' of https://github.com/ShivKatall/Roster