Update
Merge branch 'master' of https://github.com/tonegolf71/hackmanc

* 'master' of https://github.com/tonegolf71/hackmanc:
  working through hacks, first step.. listing them:
  models, some work on the main controllers, empty methods etc

Conflicts:
	application/views/templates/partials/login_form.php