trying to fix login controls
fixed merge conflicts
deleted old files
Merge pull request #32 from stevenaweiss/master

trying to fix login controls, and merge conflicts