Added gitignore
Merge branch 'master' of https://github.com/johnsone2/rox-proposals