merged again
took out some random deletions and preparing for merge
figuring out logins
Merge branch 'master' of https://github.com/jadefeng/airlines
logins and logouts