stuff that I did
Merge branch 'master' of github.com:Juleship/Resta

* 'master' of github.com:Juleship/Resta:
  footer giusto
  fixed footer

Conflicts:
	footer.php