have to add ajax
Merge branch 'master' of github.com:ayumii/Angela