working commit
Fixed conflicts.
Merge pull request #13 from mhamel01/corrected_account_create

Corrected account create