delete uneccessary file
profile edit page
profile edit 2
modelの修正
Merge branch 'master' of
http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno.git

Conflicts:
	app/controllers/Application.java
	app/models/Photo.java
	app/models/User.java
profile
merged
merged
Merge branch 'master' of http://www.se.cs.titech.ac.jp/lecture/exp4/git/abeno
fix conflict