Adding more about us text and about to start adding the pictures.
Merge remote-tracking branch 'upstream/master'
Finished About Us page, minus Jauzey and Nadeem's user bio's, but I think Jauzey took care of those.
Fixed issue with black and white buttons.
Resolved merge conflicts in aboutus.jade
Merge pull request #31 from deemz0/master

Final version for project presentation on Monday 4/28
Merge branch 'bushwack-master'

Conflicts:
	public/stylesheets/style.css
Merge remote-tracking branch 'upstream/master'
added layering functionality, refactored deslecting to account for overlapping paths bug