fixing final UI issues in conflict with other branches
Fix ambigiously failing capybara test
optimize for desktop and mobile layout both with separate media queries
fixing minor issues in newlines
delete redundant JS file in pipeline
add FIXME and other minor DRYing
fix minor css borking
Resolve merge conflicts
Update README.rdoc
Actually save the file so previous commit takes hold in the heroku environment *slaps head on desk*
fix migration mess
resolve merge conflicts