added landing route
added background, log in logic
basic layout
Merge branch 'master' of github.com:dyep49/time-midpoint into development
new test
fixing issues
Merge branch 'master' of github.com:dyep49/time-midpoint into development
Merge pull request #10 from dlopezh/master

login logic
Merge branch 'master' of github.com:dyep49/time-midpoint into development
working on adding markers
cleaning temp file
resolving merge conflict
fixing more merge comflicts
Merge branch 'development'
Merge pull request #11 from jtrope89/master

Fixed Merging Issues
new commits
praying git issues resolved
git stuff
still fixing
Merge branch 'master' of github.com:dyep49/time-midpoint into development