Fixed things
Merge branch 'master' of 192.168.1.109:~/webDesign