Keeping things simple and working. Able to go to landing page from login and signup page on create account.
Merge remote-tracking branch 'origin'

Conflicts:
	server/views/layout.ejs
	server/views/login.ejs
Keeping things simple and working. Able to go to landing page from login and signup page on create account.
Merge remote-tracking branch 'origin'
Merge pull request #103 from suprbh/master

minor changes to fix merge conflict