navigation bar
merge
Merge branch 'master' of github.com:byuric/SocialGoodIO
user projects
Merge branch 'master' of github.com:byuric/SocialGoodIO

Conflicts:
	.idea/workspace.xml