initial-check-in
Merge branch 'master' of https://github.com/alex-rails/awdwr4

initial check in