v.12

hello
Merge pull request #4 from FishingtonStudios/third-branch

v.12