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
profile
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
ユーザー名が変更できないようにした
ヘッダーのアバターが変わるようにした
fixed home page layout #1
used wookmark as jqueryplugin
redirected to home after uploading
changed save dir to user's dir
modified .gitignore file
if user.avatar == null 
set_avatar("/public/images/default.png")
at getCurrentUser() method
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
add login checker to home and toppage
fixed index page
fixed conflict
fixed model relation #1
add button image
Merge branch 'eneim' of https://github.com/eneim/abnomics.git into eneim

Conflicts:
	app/controllers/Application.java
	app/views/Application/home.html