intro
intro
button
slides
Merge branch 'master' of https://github.com/julielesseg/PMVC

Conflicts:
	source/about.html.erb
	source/events.html.erb
	source/stylesheets/_partials/_main-layout.scss
fixins
Merge branch 'master' of https://github.com/julielesseg/PMVC