initial login page
merge
add login page
temp commit
init register
add register
Update .gitignore
add wetwork framework
network progressing
fix network bug
add front page
finish login
reconstruct database
sync
delete bin
polish login
delete bin
merge
Merge branch 'master' of github.com:spidermandl/Diary

Conflicts:
	CalanderSquare/bin/calendersquare.jar
rm bin