Merge branch 'master' of github.com:Ummon/AdventOfCode2019

# Conflicts:
#	src/main.rs

diff --cc src/day04.rs
index 9cf8099,0000000..8a5064f
mode 100644,000000..100644
--- 1/src/day04.rs
--- /dev/null
+++ b/src/day04.rs
@@@ -1,10 -1,0 +1,16 @@@
 +\r
 +\r
++fn find_password(min: i32) {\r
++    ;\r
++}\r
++\r
++\r
++\r
 +#[cfg(test)]\r
 +mod tests {\r
 +    use super::*;\r
 +\r
 +    #[test]\r
 +    fn part1() {\r
 +    }\r
 +}

diff --cc src/main.rs
index 432b2f8,2c96367..f4a1fa9
--- 1/src/main.rs
--- 2/src/main.rs
+++ b/src/main.rs
@@@ -44,7 -83,12 +83,16 @@@ fn main() 
          day01,
          day02,
          day03,
++<<<<<<< HEAD
 +        day04
++=======
+         day04,
+         day05,
+         day06,
+         day07,
+         day08,
+         day09
++>>>>>>> 91620914391b197fab0624a627f1b0a24ff75364
      );
  
      let args: Vec<String> = env::args().skip(1).collect();