star
Merge branch 'master' of https://github.com/julielesseg/PMVC

Conflicts:
	source/about.html.erb
fix
intro
star!
banners and stars and stars and banners
Merge branch 'master' of https://github.com/julielesseg/PMVC