new branch
add some files
new files
complete adding author but need add controler
little change
change UI
Merge branch 'develop' of github.com:frankdede/CMPUT410W14T07 into develop

Conflicts:
	information
	server.py
merge