Merge branch 'master' of /home/efi/Projects/CineMetroApplication with conflicts.
correctly signs up the user to parse...working on the update