Story S-01056: Story S-01056 and Story S-01058: User Login - Guard User
Merge branch 'master' of
https://github.com/ManilaADM/medicine-inventory.git

Conflicts:
	public/stylesheets/main.css