login, signup, flicker, g maps
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/config/autoload.php
	application/controllers/login.php
	application/models/user.php
	application/views/home_view.php
	application/views/login_view.php
	application/views/signup_view.php
	assests/css/style.css