Merge pull request #4 from nicklmarks/master

finally fix all the bullshit
Merge pull request #5 from nicklmarks/master

added TBA for the fire department party
added a picture I think dom made
 updated showdates to make it look nicer and added a link to the 420show
Merge pull request #4 from theolesband/master

merge nicklmarks local with theolesband master on godaddy