idk dude
Merge branch 'master' of https://github.com/Raymondd/smartest

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/Raymondd/smartest
testing login
testing login