Revert "Merge branch 'eric_working'"

This reverts commit e9bc7d9b6cdac028b7c3ed829b046439f94a194c, reversing
changes made to a7b4f2a5b7d19eae98bea43fee3731de1fa6b6de.

Conflicts:
	README.markdown
Updated Readme
Merge branch 'eric_working'

This reverts commit e9bc7d9b6cdac028b7c3ed829b046439f94a194c, reversing
changes made to a7b4f2a5b7d19eae98bea43fee3731de1fa6b6de.

Conflicts:
	README.markdown
Updated Readme

Messed up git commits...
Merge branch 'eric_working'
Test commit