Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/values/colors.xml

app/src/main/java/com/example/taskboxx/DashboardFragment.java

@@ -72,7 +72,12 @@ public class DashboardFragment extends Fragment {
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) {
                 String selectedbookmark = bookmarks.get(position);
-                String URL = "http://"+bookmarkdetails.get(selectedbookmark);
+                String URL;
+                if (bookmarkdetails.get(selectedbookmark).contains("http://") || bookmarkdetails.get(selectedbookmark).contains("http://")){
+                    URL = bookmarkdetails.get(selectedbookmark);
+                } else {
+                    URL = "http://"+bookmarkdetails.get(selectedbookmark);
+                }
                 Toast.makeText(getActivity().getApplicationContext(), "Bookmark selected: "+selectedbookmark, Toast.LENGTH_SHORT).show();
                 Uri uri = Uri.parse(URL);
                 Intent BrowserIntent = new Intent(Intent.ACTION_VIEW,uri);

app/src/main/res/values/colors.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3b5998</color>
-    <color name="colorPrimaryDark">#3b5998</color>
-    <color name="colorAccent">#8b9dc3</color>
+    <color name="colorPrimary">#795548</color>
+    <color name="colorPrimaryDark">#5d4037</color>
+    <color name="colorAccent">#ff8f00</color>
 </resources>