Merge pull request #7 from afalsario/afalsario

Afalsario
Adjusting everything to elimiate the profiles table. Replaced all 'profile' items with 'user' .
consolidating tables
Merge pull request #8 from afalsario/alex

Alex committing changes
fixing merge conflicts