small changes
aaa
we
we
qwfa
Merge branch 'master' of https://github.com/Sawdre/myNavProject

Conflicts:
	.DS_Store

Added categories screen