added bk's style changes
modified Gemfile again to not use SQLite
removed sqlite
changed some routes
changed gemfile
added foundation?
added foundation?
did i do anything?
heroku icons removed?
foundation maybe?
remove gemfile.lock
gemfile.lock readded
Can view calenar
nothing really changed
Merge branch 'master' of https://github.com/liuben10/cs169
added some coloring to events to specify event status
Updated dashboard events to use events table
Fixed merge conflict
Cleaned up merge
Updated dashboard events to account for pending appointments