modified things
Merge branch 'WebSprint4' of https://github.com/RHITJuniorProjects/JrProj-1415-Mike into WebSprint4
added stuff to index
fixed conflict