First attempt at using a library
Merging in changes from master
Fixed bug in log in
Adding some files
Merging