added devise authentication
fixed merging conflicts
Merge pull request #6 from BrainStationEducation/authentication

Looks good...