Mark's First Merge

Changed some basic login stuff