commit 5
commit 5
le>'
as appropriate to mark resolution, or use 'git commit -a'.
Merge branch 'master' of https://github.com/powerpoint45/Lucid-Browser

Conflicts:
	src/com/powerpoint45/lucidbrowser/MainActivity.java

 Committer: michael <michael@antergos.gateway.2wire.net>