basic
Merge branch 'master' of https://github.com/jamesfebin/BoutAngel

Conflicts:
	Images/fbconnect.png
	Images/twitconnect.png
	Styles/styles.css
	socialize.html