working on UI
Merge branch 'master' of https://github.com/Janek2004/UWFNursing

Conflicts:
	UWFNursing.xcodeproj/project.pbxproj