fix db
update files and added subscribe.erb
final commit
Merge branch 'final'