new homepage
asdfasdf
test branching
fix merge problem
asdfadsf
asdfa
fixed homepage paths
asdfadf
Merge branch 'master' of github.com:mugu87/myApp
best of today so far
fix merge