2014年6月10日15:24:22
2014年6月10日16:44:11
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:xwak/issss

Conflicts:
	views/default.erb
Merge branch 'master' of github.com:xwak/issss

Conflicts:
	views/change_user_info.erb
	views/default.erb
	views/login.erb