another version
Merge branch 'master' of github.com:discoliam/discoliam

Conflicts:
	assets/stylesheets/style.css
social, more responsive sizing and two new porojects