oops, this shouldn't be here.
Merge branch 'master' of github.com:Cykey/RPi_Cam_Web_Interface
Merge branch 'master' into nginx