Stop tracking this damn thing.
Merge branch 'master' of https://github.com/williamrjribeiro/wallpaper-ruler-bb10

Conflicts:
	application/src/assets/.assets.index