Fixed merging issues
Merge branch 'ryan'
Added Contact and Sign-in links to menu
Merge branch 'ryan'
Changed Banner
Lotsa changes
Merge branch 'ryan'
test
More changes
Merge branch 'ryan'
Merge branch 'master' of github.com:mugu87/myApp
Merge branch 'master' of github.com:mugu87/myApp into minh