Merge branch 'ah-db_setup'
Merge branch 'master' of github.com:andy4thehuynh/dc into users-form
switch to haml and get first name last name and account type