ya
Merge branch '2.0' of https://github.com/shane7226107/MilestoneS into 2.0

Conflicts:
	app/views/node/index.html.erb