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
live stream on main page...no styling
live stream on main page...no styling
Merge branch 'master' of https://github.com/Renesau/brickcam
chris
Merge branch 'master' of github.com:Renesau/brickcam
alan take this one
camera page
front page changes
camera page presentable, main page almost presentable