Reformating code to reduce coupling
Work to get pull to work
Refactored the code to make more effective use of the base.html
Merge branch 'master' of github.com:1101811b/TeamQProject