- new files
- db
Merge branch 'master' of https://github.com/bhaskarraju/dollarteam

Conflicts:
	application/views/main/login_form.php