Now uploaded boostrap as well ! Brilliant.
Fixed the facebook logging.  Requires no more ridiculous hacks.
Fixed conflicts with head

Merge branch 'master' of github.com:malteseunderdog/fielderic

Conflicts:
	app/views/home/index.html.erb