Almost done dashboard
Merge branch 'master' of https://github.com/JPWS2013/SoftDes_Project
Almost complete dash