Merging Tobin's team's code into our repo

Summary of steps i have gone through;
1. Forked https://github.com/openmrs/openmrs-module-chartsearch.git
2. git clone  git clone https://github.com/k-joseph/openmrs-module-chartsearch.git
3. git pull https://github.com/tallevi12/ChartSearch.git master
4. Resolved CONFLICTS
5. git push origin master
6. Opened up a new PR
Meanwhile now trying to resolve some issues within the code that i have thereafter seen