dabndfa

dsh
licence

licence description
Merge origin/master

Conflicts:
	application/views/login.php
Delete test.html
Merge origin/master
Merge origin/master

Conflicts:
	application/views/login.php
zipped files

whole project's zip
Merge origin/master
Merge origin/master

Conflicts:
	application/views/login.php
Merge origin/master

Conflicts:
	application/views/login.php
Merge origin/master

Conflicts:
	application/views/login.php
css test

css test: line changes
sql file & base url

sql file addition & updated base URL: $config['base_url']
API Development

CALAIS API examples codes
index.php
calais-json file examples
comments
calais-json file examples
.xlsx file addition
.CSV file addition