Merge pull request #21 from Orasi/staging

Last Lew push
Merge branch 'staging'
Merge branch 'staging'
Update vacations_controller_test.rb
Merge pull request #22 from LGordon2/patch-1

Update vacations_controller_test.rb
Merge pull request #23 from Orasi/master

As Directed by Lew