moved upload button
Merge branch 'jack' into develop

adding radio buttons
made upload show button nice
Merge branch 'develop' of https://github.com/dwkns/fireworks into develop

making sure online status appears
fixed merge conflicts
online status now working
Made changes in prepartion for heroku
Merged develop into ham

Merge branch 'develop' into ham
Changed styling of radio buttons and moved js to separate file