merge nicklmarks local with theolesband master on godaddy

this is to make nicklmarks local the same as the live site