renamed vagrant.rst
added a todo about roles in toyproject.rst
made unmergeable
removed extra info
Conflict resolved
Ignored the backed up files