Changed log in/sign up to modal, added cancel buttons
Merge branch 'master' into j

Conflicts:
	Project12/SLSearchFeedViewController.swift
	Project12/SLSignUpViewController.swift
Refactoring + fixes
Merge pull request #4 from SEDAWGS/j

J