commit b4 merging handlebars
Cleaned cache
Merge branch 'master' of github.com:micmmakarov/omgwant

Conflicts:
	app/assets/javascripts/templates/profile.hamlbars
Merge branch 'master' of github.com:micmmakarov/omgwant

Conflicts:
	tmp/cache/assets/C18/BE0/sprockets%2Fbf8726f9116462b007238e400e114187
	tmp/cache/assets/C5C/D00/sprockets%2F6126e894d2f7f9d8922014f60960270c
	tmp/cache/assets/C7C/020/sprockets%2F142cd61e1531b19747226e5f63ba2688
	tmp/cache/assets/CA0/5D0/sprockets%2F73110e654c8601f6402eb2d8208a2fe3
	tmp/cache/assets/CAD/270/sprockets%2F39b5e467af68877e2a91b21011f5c204
	tmp/cache/assets/CB7/DD0/sprockets%2F3d36a84261f57fd1477b3c86553bb609
	tmp/cache/assets/CD8/780/sprockets%2F5b9726ac2e981f21856ca53a8b0c2116
	tmp/cache/assets/CE1/070/sprockets%2F7c3c143bec4c2d5807609ef912b74645
	tmp/cache/assets/CE2/4A0/sprockets%2Fe67aebde640a5e72093f40495066e381
	tmp/cache/assets/CF1/E50/sprockets%2F627ffd39f3642a2a236775d77839fac3
	tmp/cache/assets/CF2/BE0/sprockets%2F240751978b1df69a26fcc759a2e5e478
	tmp/cache/assets/CF4/140/sprockets%2F22a3157d204c1f8e417a25f01a2dbe45
	tmp/cache/assets/D05/3D0/sprockets%2Fd454dd809ff60611b5a0161f67523bdb
	tmp/cache/assets/D0F/3E0/sprockets%2F6654975eaa53a225d976278fcb6baa00
	tmp/cache/assets/D0F/DB0/sprockets%2F081e462119bbd29c744cbb9d0ed92395
	tmp/cache/assets/D13/430/sprockets%2F5a9058ba71047abee8d37c74f2807c19
	tmp/cache/assets/D16/D80/sprockets%2F494c3346dd194e65977bf4fa9aca0620
	tmp/cache/assets/D1A/560/sprockets%2Fad7f01c92c7691ad4985166ad5d38d55
	tmp/cache/assets/D30/240/sprockets%2Fe3b1f1f55bc9a3504c62584057ebc31a
	tmp/cache/assets/D32/AA0/sprockets%2F9a20b5d2721b0fb28f3dea78a58a0077
	tmp/cache/assets/D3D/580/sprockets%2F6b3eaa81a2821dbc93367348b1c9ee47
	tmp/cache/assets/D42/910/sprockets%2F73e79931e6a8d8f2011786d5b1cc2eaa
	tmp/cache/assets/D4B/EC0/sprockets%2Fb261fa987a3e88f07b352eba69495e3b
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D52/C80/sprockets%2Fb2c2b1ffa8392d4a54698e38995f6ca7
	tmp/cache/assets/D56/7E0/sprockets%2Fc9afe7a18e8857ce9181202eed87955a
	tmp/cache/assets/D5F/1E0/sprockets%2Fc46b51d0a7c1511e5c9b667bc1d146eb
	tmp/cache/assets/D5F/A20/sprockets%2F6c38f9a46097c892a7828f58a5d7efbd
	tmp/cache/assets/D62/790/sprockets%2F9b6cbd2eacf2c2b633e1d06051d84754
	tmp/cache/assets/D6A/610/sprockets%2F9ef1af3d06d4b647c180b4da6e4c0818
	tmp/cache/assets/D7A/E00/sprockets%2F9557f3ef87da83aeb413eae5036915fc
	tmp/cache/assets/D7E/E30/sprockets%2F68ede71e534907a819fabfae7272a6e7
	tmp/cache/assets/D96/320/sprockets%2F155a181b137e6f1aaf09a6c68f6a8bbc
	tmp/cache/assets/D99/1D0/sprockets%2F04e76f12d66fd2d72eac20fb344f59ab
	tmp/cache/assets/D9C/4A0/sprockets%2Fcea8d92ebf3d916a99e2ac410b02857a
	tmp/cache/assets/DA0/950/sprockets%2F5db0fc5ab9837c6379a5ea51f084f2bc
	tmp/cache/assets/DC2/C40/sprockets%2F465aad1db22e06ea3fb5ef64143a9be7
	tmp/cache/assets/DCA/F90/sprockets%2Fe3d18c66b4f0e2ed8f17ae153a3be44f
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/DF5/010/sprockets%2Ff33d270fdcf86dab20dd5bb34eb9b471
	tmp/cache/assets/DFC/EB0/sprockets%2Ffa5b588ddd23c38af00ffe7c248b31fb
	tmp/cache/assets/E03/E20/sprockets%2Fd2f2e12c8229bc36edf9cd8aa5935afe
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/E1E/330/sprockets%2F41af50f07efd05dca8f4e5a5c7a2dba2
	tmp/cache/assets/E2A/E30/sprockets%2F23aff3cdb5c9aad5b1cc0f681b1c99e9
Updated gitignore
git ignore
Cache madness