merge
merge
file sys test
Merge branch 'ido' of https://github.com/aleksandarmilicevic/arby into ido
merge
trying to fix system_Test
Merge branch 'ido' of https://github.com/aleksandarmilicevic/arby into ido
added birthday model, no tests
put back the file system test
moved birthday to alloy_sample/toys; added a unit test for it
trimmed trailing spaces
added 'merge' method to represent ++
fixed arby_dsl to pass :parent_module option when appropriate; deleted old birthday.rb
tidied up file_system test
Merge branch 'master' into ido
added extra tests
removed a comment