before merge
Merge branch 'master' of https://github.com/nathancrandall/cecilia
fixed GAPING security hole
Merge branch 'master' of https://github.com/nathancrandall/cecilia