long journey through git, use this commit
results page
resolved merge conflict
resolved merge conflict
Merge pull request #11 from chriswright47/results_page

Results page