Merged from upstream
Resolve conflict
Updated .bower.json
Merged successfully
change resource link
updated homepage styling
Merge pull request #4 from fdogarro/master

updated Women's resources with filters
Merge pull request #5 from trystant/master

Merged fixes
pull chat and complete app