added pagecontent
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev
fixed bugs
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev
Changed setup.py to point to the same database
temp commit
merge conflicts
change format
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev
individual servery api
Updated opening_hours format to a more convenient one
merge conflicts
trying to edit mobile version
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev

Conflicts:
	app/static/views/main.html
merge conflicts
Add pdfminer to requirements list.
Got all text along with its corresponding position