john commit
con jquery
Merge branch 'master' of https://github.com/vitoco2489/SOP