Comment out bower script for testing
Resolved merge conflict in index.html