new rails setup
installed mysqlserver
SQLLLL
organizations pages done!
Merge branch 'nicintosh-master'

uhm i think it works
Merge branch 'sqltest'

Conflicts:
	app/views/locker_system/index.html.erb
Mysql login information

Updated login info to access new server database