ignore this
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch
chang the selection of meal in the index page

order_by( startTime )
ignore
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch

Conflicts:
	app/main/views.py
update gitignore
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch

Conflicts:
	.gitignore
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch
ignore this
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch
??
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch

Conflicts:
	config.py
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch

Conflicts:
	config.py
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch
 = =
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch
Merge branch 'server-branch' of https://github.com/jxWho/GCat into server-branch