adapted the bootswatch
Merge branch 'master' of https://github.com/DreamProgrammer/railssns

Conflicts:
	Gemfile
	Gemfile.lock
	tmp/pids/server.pid