my db changes
Merge branch 'master' of https://github.com/RufusMbugua/platform_rb

Conflicts:
	application/config/database.php
Merge branch 'master' of https://github.com/RufusMbugua/platform_rb
upload controller with the .slk function
Merge branch 'master' of https://github.com/RufusMbugua/platform_rb

Conflicts:
	application/modules/upload/controllers/upload.php
Merge branch 'master' of https://github.com/RufusMbugua/platform_rb
Merge branch 'master' of https://github.com/RufusMbugua/platform_rb
upload changes
Merge branch 'master' of https://github.com/prickinyua/platform_rb

AND Edits to Gantt
Conflicts:
	application/modules/upload/controllers/upload.php
Add New Event Modal
Loading Event in Modal
upload changes
finished bootstrat popup
Merge branch 'master' of https://github.com/prickinyua/platform_rb

Conflicts:
	application/modules/upload/controllers/upload.php
Upload working pending final touches
Merge branch 'master' of https://github.com/prickinyua/platform_rb

Conflicts:
	application/modules/upload/controllers/upload.php
Merge branch 'master' of https://github.com/prickinyua/platform_rb

Conflicts:
	application/modules/upload/controllers/upload.php
Formatting Columns
Create and Store Beans