Samuel Huckins 149c3ecc63 Various merge resolutions from master <- staging ... * --ask option ported to new location * --version option now works * MSF version updated * All specs passing		2014-08-15 11:33:31 -05:00
..
application.rb	Various merge resolutions from master <- staging	2014-08-15 11:33:31 -05:00
boot.rb	Various merge resolutions from master <- staging	2014-08-15 11:33:31 -05:00
database.yml.example	Add some friendlier defaults to database.yml	2013-04-19 15:43:25 -05:00
database.yml.travis	…
environment.rb	Various merge resolutions from master <- staging	2014-08-15 11:33:31 -05:00