secure update
Merge branch 'newpage' of github.com:Eagleo0/live into newpage