Now running PostgreSQL
Add StaticPages controller, add code for funny xxx and (1)JK(1) datalines
Merge branch 'master' of https://github.com/JackCassidy/UB5

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