Initial local commit
Merge branch 'master' of https://github.com/aesinv/Eyekool-on-Vagrant

Merging origin with local.