initial commit
Merge branch 'master' of https://github.com/pwhitespell/buendiaprototype

* 'master' of https://github.com/pwhitespell/buendiaprototype:
  Initial commit

Conflicts:
	README.md