rebuilt
Changes to contributors file

Why is my name listed as 'Baost'??
changes to readme
fixed bapst's name
Merge branch 'master' of github.com:macrojc/macrojc.github.io into gh-pages

Conflicts:
	content/pages/Contributors.md