hoge
a
ユーザー検索
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
	app/views/Application/header.html
	app/views/Application/photoviewer.html
	
＋make follower page
	app/views/Application/timeline.html
	public/stylesheets/styles.css
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
fix
cover変更
fix
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
profileの編集
aa
tes
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git
画像変更
bnm,
dafsdf
カバーでフォルト
cover-repeat comment
searchでのfollow unfollow
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git