You know what it is!
Merge branch 'master' of github.com:Tirmenat/solara
F
Merge branch 'master' of github.com:Tirmenat/solara
Shit don't work
No fucking idea
Merge branch 'master' of github.com:Tirmenat/solara

Conflicts:
	main.cpp
Merge branch 'master' of github.com:Tirmenat/solara
Brad works praise the lord allah
Merge branch 'master' of github.com:Tirmenat/solara

Conflicts:
	main.cpp
Yes