basic calendar
add bootstrap
another merge fix
deploy try 1
move ruby to top
gemfile lock
lock stff
delete lock