Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
	public/stylesheets/exp4main.css
login,signup機能作成
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
edited home page #1
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno
upload avatar
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
edited home page #2
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
	app/views/Application/home.html
	app/views/Application/index.html
	app/views/Application/toppage.html
	public/javascripts/exp4main.js
	public/stylesheets/exp4main.css
delete new Avatar
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
delete new Avatar
modified .gitignore
merged
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno
modified .gitignore #2