updating results
removed merge conflict
Merge branch 'master' of https://github.com/TeamPurple/Cyber
Merge branch 'master' of https://github.com/TeamPurple/Cyber
simple results page
Merge branch 'master' of https://github.com/TeamPurple/Cyber