hopefully fixed the merging problem
Merge branch 'master' of github.com:emetchar/wi14