update gitignore
Merge branch 'master' of github.com:Orasi/onTap
Merge branch 'master' of github.com:Orasi/onTap
Update welcome_controller.rb
Merge branch 'master' of github.com:Orasi/onTap
Merge branch 'master' of github.com:Orasi/onTap
Update welcome_controller.rb
Update application_controller.rb
Merge branch 'master' of github.com:Orasi/onTap
update to weekly mailer
merge conflicts
merge
merge
update weekly_mailer
update weekly  mailer
merge remote
quick fix to archive
allow training class
update db schema
merge