asedf
asdf
asedf
asdf
Merge branch 'master' of https://github.com/mcifelli/magicprogram.git
asdf
asdf
g
started work on login and menu
merged with paul
merged with paul
after bad pull, starting fix 5/1