fixing merge conflict
resolved merge conflicts in application_conroller and gemfile.lock
updated Gemfile.lock
Merge branch 'master' into oauth
started working on timer elements
updated gemfile
fixed merge conflict in Gemfile.lock
removed conflicts by rebuilding gemfile.lock
Merge branch 'master' into timer
application controller
deleted omniauth-github.gemspec becasue we dont need it
fixed user model