changed file directory tree
Merge branch 'master' of github.com:Yaritza/Bushwick

Conflicts:
	web.rb