initial commit
fixed merge conflicts
updated some globals
added LICENSE
cleaned up template files
removed unicorn file
updated environment
Merge pull request #1 from denen99/master

Initial Commit