Merge pull request #1 from brint/master

Initializing tons o'stuff