bug fixed
hoge
minor bug fixed for photoviewer.html
minor fix on photoviewer.html, this will be the last fix of this view
(almost perfect)
fix timeline
minor bug fixed
minor bugs fixed
minor bug fixed
minor margin fixed
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