Added rvmrc file
Testing
Trying to see what a merge conflict looks like
One last test, I promise
FINAL TEST THIS IS GOING TO WORK
Fixed xml
starting testing
Merge branch 'frontend-redesign' of github.com:ACMCMU/BoredPrototype into frontend-redesign
New Features: fixed positioning for div-col-info, toggle display for div-col-info. TODO: Avoid truncating text for div-col-info, fix gap between top of div-col-info and rest of page
Added some images and did not actually change base.css.scss or schema.rb, but git wants me to commit them anyway, it appears. My apologies if it causes any inconvenience.
header stuff
Merge branch 'frontend-redesign' of github.com:ACMCMU/BoredPrototype into frontend-redesign
Added Eddy's and Marisa's task: fix footer to stay at the bottom of the page using min-height
more header stuffs
Merge branch 'frontend-redesign' of github.com:ACMCMU/BoredPrototype into frontend-redesign
header and background change
sliding animation for events-col-info
everything works now yay
Merge branch 'frontend-redesign' of https://github.com/ACMCMU/BoredPrototype into frontend-redesign

Conflicts:
	app/assets/stylesheets/base.css.scss
Fixed footer, added slide-in to myevents page, logo position