good stuff
Move test
Adding ignore file
Crap
More crap
More crap
Stuff
more stuff
Store crap
Conflict
Conflict
Merge branch 'master' into locator
store.html
Branch crap
Crap
stuff
crap
added stuff
Anohter change
finished merge