Updated Views
Merge branch 'master' of https://github.com/CSC495-2014/TeamworkEnglewoodGit
Merge pull request #60 from mboie/master

Updated Views