Merge branch '2.6' of C:\Users\mcjbo_000\AndroidStudioProjects\EegBuddy_ with conflicts.
Main Page layout finished