bug fix
bug fix
conflict fix
conflict resolved
Merge branch 'master' of github.com:Renesau/brickcam
resolve confilt
Merge branch 'master' of github.com:Renesau/brickcam

Conflicts:
	app/views/user/index.html.erb

resolve conflict