init package.json
added expressjs as dependency
starting work on back-end. package json created
updated package.json
trying to fix merge conflict
updated package json
updated package json, working around merge conflict
fixing conflict
created basic server with connection to folder views
the homepage has content
throwing an error if the username field is empty
added background image, added login form
To add front-end files merged into development, into back-end to help in developing the server
Merge branch 'development' into back-end
added procfile
altered server.js for heroku export
moved sign in form to seperate file, created jquery fade-in heading
octocat as a separate image from background
pulsating octocat img
correct jasmine script to work
on click functionality for main image to be replaced by sign in form