homeslider updates
merge and fixing conflict
Javascript fix to overlap conflict
Merge branch 'master' of https://github.com/johnjameswhitman/cocobolo
Catching Blake up