Spring 1 working!!!
Merge pull request #2 from fnk0/test

Sprint 1 working!!!