Merge branch 'hw1' of https://github.com/themultiplexer/bsys-ws17-grp11 into hw1

Fixed whitespace

Conflicts:
	hw1/task4/src/lib.rs

hw1/task2/src/lib.rs

@@ -1,6 +1,6 @@
 //This function prints the n-th power of 2 and returns it.
 pub fn square(n: u32) -> u64 {
-    let sq: u64 = 2u64.pow(n-1); //(n-1) to solve the (in my opinion wrong) tests.
+    let sq: u64 = 2u64.pow(n - 1); //(n-1) to solve the (in my opinion wrong) tests.
     println!("{}", sq);
     sq
 }

hw1/task3/src/lib.rs

@@ -1,9 +1,9 @@
 pub fn count(line: &str, c: char) -> u64 {
-   let mut occurances = 0;
-   for char in line.chars(){
-      if char == c {
-        occurances += 1;
-      }
-   }
-   occurances
+    let mut occurances = 0;
+    for char in line.chars() {
+        if char == c {
+            occurances += 1;
+        }
+    }
+    occurances
 }

hw1/task4/src/lib.rs

@@ -1,6 +1,6 @@
 pub fn square_of_sum(n: i32) -> i32 {
     let mut i: i32 = 0;
-    for x in 1..n+1 {
+    for x in 1..n + 1 {
         i += x;
     }
     i.pow(2)