About footer contact header html partials
Partials contact and footer changes
Merge branch 'master' into Pranava_Users
Merge pull request #57 from elitenomad/Pranava_Users

Pranava users
hide tables if empty
Merge branch 'master' into federico

solved conflicts
Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb