delete&combine
bug fix
spacing fix, gitignore
merge fix
show rest of apps below for now
Delete environment_variables.rb
fixed bug where current_user.id would be accessed without first checking whether there was a user logged in
Merge branch 'master' of github.com:gatala/calapps
merge fix
show view fix