Actually commit changes
Sorry, github flipped on me
Merge remote-tracking branch 'origin/master'

Conflicts:
	Contact.php
	User.php
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/dorisxian/Resumate