Added some sidebar functionality
Merge branch 'master' of github.com:alexcoleman/portal

Conflicts:
	public/css/styles.css