Merge branch 'master' of https://github.com/jordanyoungberg/designsuu

Conflicts:
	admin_login.html