change format
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Merge pull request #13 from leituo56/Dev_TuoLei

Dev tuo lei
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  update explore.html: use ?page=page api, improve onLoadData function
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  separate photo_load.js from explore.html
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  update user_page.html, changes in photo_load.js, explore.html
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  explore.html correction
Merge branch 'dev-xiaoli'

* dev-xiaoli:
  add filter in explore.html, add filter.css
Basic Statistic API, not finished
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Merge pull request #14 from leituo56/Dev_TuoLei

Dev tuo lei
Site Stat api, User Stat api, find user, add a new init script add 1000 data and 100 user
Site Stat api, User Stat api, find user, add a new init script add 1000 data and 100 user
add some url and pages,
add test cases
Need db migration or rm db and syncdb
Merge branch 'master' of https://github.com/leituo56/CMPE272-Group6 into Dev_TuoLei
Merge pull request #15 from leituo56/Dev_TuoLei

Dev tuo lei
Merge pull request #16 from leituo56/dev-xiaoli

change header/ footer style, include bootstrap