Merge pull request #59 from CSC694/master

updated login screen with demo actions
Added changes discussed in class
Merge pull request #60 from SteveLobdell/master

Added changes discussed in class
fixed buttons
buttons working