Merge pull request #1 from theolesband/master

merge nicklmarks local with theolesband master on godaddy
fix the stupid shit
partial fix
hopefully last bugs
git bug in the live site
correct css files
news.css
added welcome changes
fix the stupid shit
partial fix
hopefully last bugs
git bug in the live site
correct css files
news.css
welcome.php git bugs
merch.css conflict
added news.css to fix the conflict
Merge pull request #4 from nicklmarks/master

finally fix all the bullshit