commit
Merge branch 'master' into kyle
added feature that removed the buttons when logged in
Merge branch 'kyle'