Added welcome page :D
merge cj-events
merge fix
Update schema.rb
Update user.rb
working on calendar
User Authentication
Merge branch 'master' of https://github.com/cjacks0413/smith-music
merge fix
db update
another merge fix
deploy try 1
move ruby to top
gemfile lock
lock stff
delete lock