overriding angular template
merging conflicts in controllers
Merge branch 'DevBranch' of https://github.com/DaDanny/HoG into stephen
fix connection to db
timeline finally working with images AND carousel control
merge conflicts