Completed Facebook and Google plus registration
Merge branch 'master' of https://github.com/IsaacNeal/backburnr

Conflicts:
	fb_register.php

git commit origin master