Merge pull request #98 from mshamash/master

	Worked on login system some more
Avoiding merge conflicts.
Merge pull request #45 from stephandev/master

Avoiding merge conflicts.