pull from master
fix pull conflict
pre merge
Merge branch 'master' of https://github.com/JoyP/intouch into showPage
working code
Merge pull request #7 from JoyP/showPage

Show page
css to the show page
added background photo and link to mail
css changes
Merge branch 'master' into css
update form works
working on show contact
in progress
draft of photo upload
HttpInterceptor
Merge branch 'master' of https://github.com/JoyP/intouch into login
Login Auth
Merge pull request #8 from JoyP/login

Login
add contact working
fix birthday display in contact list