Merge branch 'master' of https://github.com/nategot/Benny

Conflicts:
	Project/Styles/killercarousel.css