bootstrap
fixing the conflicts
fixing stuff
coflicts fixed
private issue
simple copy
Merge pull request #8 from sociallyRK/authentication

Authentication