nothing
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo
Delete ics-lib-db.sql
Merge pull request #10 from BuracayBeach/team1_v1.1

added incomplete edit module
Fixed user search
Fixed User search
Fixed User Search
Merge pull request #11 from BuracayBeach/team4_v1.11

Team4 v1.11
Migrated from book_model to seach_model
Merge pull request #12 from BuracayBeach/team4_v1.11

Migrated from book_model to seach_model
updated favorites, reserves, notifs
Merge pull request #13 from BuracayBeach/team_2_v1.1

updated favorites, reserves, notifs
updated schema of  and
Revert "updated schema of  and"

This reverts commit f0fb29617af5b7d1dc21ccf945d3c7c7c6cc30e6.
Revert "Revert "updated schema of  and""

This reverts commit cb47408e869d04400f15d95a8949beb17f2c560b.
Merge pull request #14 from BuracayBeach/team_2_SQL

Team 2 sql
Added Search Any Field
Merge pull request #15 from BuracayBeach/team4_v1.2

Added Search Any Field
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo
Merge branch 'master' into team1_v1.2

Conflicts:
	application/controllers/booker.php
	application/models/book_model.php
	application/models/search_model.php