Merge pull request #43 from palmerhyde/shane

Shane
Missing file
Merge pull request #45 from palmerhyde/fs-login

Missing file
Merge branch 'develop' into shane