test #5
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
added font folder
edited popup
fixed popup
import
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno

Conflicts:
	app/controllers/Application.java
	app/views/Application/index.html
make login signup page
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
	app/views/Application/index.html
	app/views/Application/main.html