inline form for new group
some fixes
Merge branch 'master' of github.com:elitenomad/expense_tracker

conflict fixed
Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
other commit
Merge branch 'master' of github.com:elitenomad/expense_tracker
Merge pull request #55 from elitenomad/federico

Federico
About footer contact header html partials
HEY we have some javascript here!! try to close the notice and error
Merge branch 'master' into federico
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
Font and table restructure
Merge pull request #56 from elitenomad/federico

Federico
Corrected conflicts
Merge pull request #58 from elitenomad/Pranava_Users

Pranava users
Merge branch 'master' into marcus

a few conflicts,
application layout
contact page
groups index
myepxpenses partial
custom css
Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/expenses/_myexpenses.html.erb
	app/views/groups/index.html.erb
	app/views/layouts/application.html.erb
	app/views/pages/contact.html.erb