for development, i removed admin authentication on controllers
Updated Galaxy model and views to incorporate the rest of the galaxy attributes. need to fiture out if 'stars' and 'vcr' need to be renamed
removed all bootstrap files from the project and replaced them with bootstrap-sass gem. updated navbar and styling. also removed monkey patch for quiet_assets and added a quiet_assets gem for development
removed unncessary code from application.js
updated width of SOCM main page view. added TODO in view, and placed a small description about what SOCM is and does.
fixed active link bug in navbar. also fixed styling with active links and inactive links in the navbar
one last navbar bug fix ><
static assets failing to serve proper css
somehow a rails application made its way into socm. removed it all -- not sure when this happened ...
removed embedded rails project. not sure when or why this happened
Merge pull request #2 from RoCMSOCM/file_fix

removed embedded rails project. not sure when or why this happened
cleaned up master pull in .gitignore
fixed .gitignore - typo. also removed all public assets from commits
Merge pull request #1 from RoCMSOCM/Feature/Add-Citations

Add in the Citation skeleton
added rspec gem and factorygirl
replaced _test.rb with _spec.rb to use rspec
test folder needed to be removed
updated rspec tests for GalaxiesController. also added a 404 page -- need to figure out if FactoryGirl is cleaning up records after test suite
finished get, post, put, delete methods for Galaxy controller
Merge pull request #3 from RoCMSOCM/rspec

Rspec initial merge with master