login GUI
merge master to Anna
Merge branch 'master' into Emily