update
updated 2#
Merge branch 'master' of github.com:dbishoponline/dyleo

Conflicts:
	app/.vagrant