diff --git a/app.py b/app.py
index 09173a5..d136358 100644
--- a/app.py
+++ b/app.py
@@ -19,12 +19,14 @@ from oauth2client.service_account import ServiceAccountCredentials
 import os
 from werkzeug.utils import secure_filename
 from camera import VideoCamera
-# import pyaudio
+import pyaudio
 import sqlite3
 from flask_mail import Mail, Message
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.header import Header
+from datetime import datetime
+from dateutil import parser
 
 
 main = Blueprint('main', __name__)
@@ -138,7 +140,7 @@ DRIVE_SCOPES = "https://www.googleapis.com/auth/drive"
  
 @socketio.on('message')
 def handleMessage(msg):
-	print('Message: ' + msg)
+	print('Message: ' + msg.decode("utf-8"))
 	send(msg, broadcast=True)
     
 @app.route("/")
@@ -155,6 +157,15 @@ def main():
         creds = tools.run_flow(flow, store)
     drive_service = build('drive', 'v3', http=creds.authorize(Http()))
     
+    connection = sqlite3.connect('database.db', isolation_level = None)
+    cur = connection.cursor()
+    cursor = cur.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='logins'")
+    results = cursor.fetchall()
+    if len(results) > 0:
+        pass
+    else:
+        cur.execute("CREATE TABLE logins (login TEXT PRIMARY KEY)")
+    connection.close()
     return render_template('index.html', info="Witaj!")
     
 @app.route("/indexENG")
@@ -239,7 +250,7 @@ def signUpENG():
         cursor.close() 
         conn.close()    
         
-@app.route('/validateLogin',methods=['POST'])
+@app.route('/validateLogin', methods=['POST'])
 def validateLogin():
     #con, cursor = None, None
     #try:
@@ -273,9 +284,20 @@ def validateLogin():
             else:
                 test = False
         else:
-            test = False
+            test = False  
+        cursor = cur.execute("SELECT login from logins")
+        logins = cursor.fetchall()
+        print (logins)
+        emails = []
+        for login in logins:
+            emails.append(login[0])
+        print (emails)
+        if session["user"].split("@")[0] not in emails:
+            cur.execute("INSERT INTO logins(login) values(?)", (session["user"].split("@")[0],))
+        cursor = cur.execute("SELECT login from logins")
+        logins = cursor.fetchall()
         connection.close()
-        return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = test)
+        return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = test, logins = logins)
     # else:
         # return render_template('error.html',error = 'Zły email lub hasło!')
     except smtplib.SMTPAuthenticationError:
@@ -335,7 +357,17 @@ def validateLoginENG():
 @app.route('/userHome')
 def userHome():
     if session.get('user'):
-        return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = test)
+        connection = sqlite3.connect('database.db', isolation_level = None)
+        cur = connection.cursor()
+        cursor = cur.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='tests'")
+        results = cursor.fetchall()  
+        cursor = cur.execute("SELECT login from logins")
+        logins = cursor.fetchall()
+        connection.close()
+        if len(results) > 0:
+            return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = True, logins = logins)
+        else:
+            return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False, logins = logins)
     else:
         return render_template('error.html',error = 'Nieautoryzowany dostęp!')
 
@@ -548,9 +580,8 @@ def signInWithFace():
     cv2.destroyAllWindows()
     connection = sqlite3.connect('database.db', isolation_level = None)
     cur = connection.cursor()
-    cursor = cur.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='tests")
+    cursor = cur.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='tests'")
     results = cursor.fetchall()
-    connection.close()
     if len(results) != 0:
         cursor = cur.execute("SELECT title from tests")
         results = cursor.fetchone()
@@ -560,7 +591,10 @@ def signInWithFace():
             test = False
     else:
         test = False
-    return render_template('userHome.html', info="Zapisano twarz", user=session.get('user').split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = test)     
+    cursor = cur.execute("SELECT login from logins")
+    logins = cursor.fetchall()
+    connection.close()
+    return render_template('userHome.html', info="Zapisano twarz", user=session.get('user').split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = test, logins = logins)     
 
 @app.route('/signInWithFaceENG')
 def signInWithFaceENG():
@@ -633,12 +667,19 @@ def addEvent():
     summary = request.form["inputSummary"]
     location = request.form["inputLocation"]
     description = request.form["inputDescription"]
-    description = request.form["inputDescription"]
-    description = request.form["inputDescription"]
     start = request.form["inputStart"]
     end = request.form["inputEnd"]
     attendees = request.form["inputAttendees"].split(',')
     
+    datetime_start = parser.parse(start)
+    datetime_end = parser.parse(end)
+    
+    print (datetime_start)
+    print (datetime_end)
+
+    if datetime_start > datetime_end:
+        return render_template('error.html',error = 'Nieprawidłowy termin')
+    
     processed_attendees = []
     for attendee in attendees:
         attendee = attendee.strip()
@@ -683,9 +724,8 @@ def addEvent():
     service.events().insert(calendarId='primary', body=event).execute()
     connection = sqlite3.connect('database.db', isolation_level = None)
     cur = connection.cursor()
-    cursor = cur.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='tests")
+    cursor = cur.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='tests'")
     results = cursor.fetchall()
-    connection.close()
     if len(results) != 0:
         cursor = cur.execute("SELECT title from tests")
         results = cursor.fetchone()
@@ -694,8 +734,11 @@ def addEvent():
         else:
             test = False
     else:
-        test = False
-    return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = test)
+        test = False  
+    cursor = cur.execute("SELECT login from logins")
+    logins = cursor.fetchall()
+    connection.close()
+    return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = test, logins = logins)
 
 @app.route('/streaming')
 def streaming():
@@ -716,6 +759,20 @@ def gen(camera):
 
 @app.route('/stream')
 def stream():
+    connection = sqlite3.connect('database.db', isolation_level = None)
+    cur = connection.cursor()    
+    cursor = cur.execute("SELECT login from logins")
+    logins = cursor.fetchall()
+    emails = []
+    for login in logins:
+        emails.append(login[0] + "@gmail.com")
+    print (emails)
+    msg = mail.send_message(
+        'Nowy stream',
+        sender='wirtualna.uczelnia.2018@gmail.com',
+        recipients=emails,
+        body="Został uruchomiony nowy stream pod adresem:\n" + "http://192.168.8.100:5000/streaming"
+        )
     return Response(gen(VideoCamera()),
                     mimetype='multipart/x-mixed-replace; boundary=frame')        
 
@@ -774,7 +831,11 @@ def resources():
             #file = request.form["fileToUpload"]
             filename = secure_filename(file.filename)
             file.save(os.path.join(app.config['UPLOAD_FOLDER'], filename))
-            return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False)
+            connection = sqlite3.connect('database.db', isolation_level = None)
+            cur = connection.cursor()    
+            cursor = cur.execute("SELECT login from logins")
+            logins = cursor.fetchall()
+            return render_template('userHome.html', user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False, logins = logins)
         else:
             return redirect(url_for('toResources'))
         
@@ -912,7 +973,7 @@ def create_test():
         'Zostałeś przydzielony do nowego testu',
         sender='wirtualna.uczelnia.2018@gmail.com',
         recipients=emails,
-        body="Pojawił się nowy test, zaloguj się i go rozwiąż:\n" + "http://150.254.78.161:5000/showSignIn"
+        body="Pojawił się nowy test, zaloguj się i go rozwiąż:\n" + "http://192.168.8.100:5000/showSignIn"
         )
         connection = sqlite3.connect('database.db', isolation_level = None)
         cur = connection.cursor()
@@ -976,8 +1037,10 @@ def add_question():
             cursor = cur.execute("SELECT * from questions")
             print (cursor.fetchone())
             # print (cursor)
-            # connection.close()
-            return render_template("userHome.html", user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = True)
+            cursor = cur.execute("SELECT login from logins")
+            logins = cursor.fetchall()
+            connection.close()
+            return render_template("userHome.html", user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = True, logins = logins)
     else:
         return render_template("error.html", error = "Brak dostępu!")
 
@@ -985,24 +1048,22 @@ def add_question():
 def show_test():
     connection = sqlite3.connect('database.db', isolation_level = None)
     cur = connection.cursor()
-    cursor = cur.execute("SELECT name from sqlite_master where type='table' and name='results'")
-    if len(cursor.fetchall()) > 0:
-        cursor = cur.execute("SELECT nickname from results")
-        users = cursor.fetchall()
-        # if session["user"] + "@gmail.com" in users:
-        if (session["user"].split("@")[0],) not in users:
-            cursor = cur.execute("SELECT * from questions")
-            questions = cursor.fetchall()
-            print (questions)
-            cursor = cur.execute("SELECT title from tests")
-            title = cursor.fetchone()
-            print (title)
-            connection.close()
-            return render_template("test.html", questions = questions, test = title[0])
-        else:
-            return render_template("error.html", error = "Nie możesz wypełnić tego testu!")
+    cursor = cur.execute("SELECT nickname from results")
+    users = cursor.fetchall()
+    # if session["user"] + "@gmail.com" in users:
+    print (users)
+    if (session["user"].split("@")[0],) not in users:
+        cursor = cur.execute("SELECT * from questions")
+        questions = cursor.fetchall()
+        print (questions)
+        cursor = cur.execute("SELECT title from tests")
+        title = cursor.fetchone()
+        print (title)
+        connection.close()
+        return render_template("test.html", questions = questions, test = title[0])
     else:
-        return redirect("userHome")
+        return render_template("error.html", error = "Nie możesz wypełnić tego testu!")
+    
     
 @app.route("/test", methods = ["POST"])
 def test():
@@ -1022,14 +1083,17 @@ def test():
             if answers[j] == correct_answers[j][0]:
                 points += 1
         cursor.execute("INSERT INTO results values(?, ?)", (session["user"].split("@")[0], points))
-        connection.close()
         if points == 1:
             sentence = "punkt"
         elif points == 2 or points == 3 or points == 4:
             sentence = "punkty"
         elif points > 4 or points == 0:
             sentence = "punktów"
-        return render_template("userHome.html", user=session['user'].split('@')[0] + ". Twój wynik wyniósł " + str(points) + sentence, calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False)    
+        cur = connection.cursor()    
+        c = cur.execute("SELECT login from logins")
+        logins = c.fetchall()
+        connection.close()
+        return render_template("userHome.html", user=session['user'].split('@')[0] + ". Twój wynik wyniósł " + str(points) + sentence, calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False, logins = logins)    
             
         # if answer == correct_answer:
             # cursor = connection.execute('SELECT points from results where nickname = ?', session["user"])
@@ -1047,25 +1111,29 @@ def test():
 def end_test():
     connection = sqlite3.connect('database.db', isolation_level = None)
     cur = connection.cursor()
-    if session["role"] == "admin": 
-        cursor = cur.execute('SELECT MAX(points), nickname from results group by nickname')
-        results = cursor.fetchall()
-        cur.execute('DROP TABLE IF EXISTS tests')
-        cur.execute('DROP TABLE IF EXISTS questions')
-        cur.execute('DROP TABLE IF EXISTS users')
-        cur.execute('DROP TABLE IF EXISTS results')
-        connection.close()
-        if len(results) != 0:
-            print (results)
-            if results[0][0] == 1:
-                sentence = "punkt, a uzyskał go: "
-            elif results[0][0] == 2 or results[0][0] == 3 or results[0][0] == 4:
-                sentence = "punkty, a uzyskał go: "
-            elif results[0][0] > 4 or results[0][0] == 0:
-                sentence = "punktów, a uzyskał go: "
-            return render_template("userHome.html", user=session['user'].split('@')[0] + "\nNajlepszy wynik z ostatniego testu wyniósł " + str(results[0][0]) + sentence + str(results[0][1]), calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False)
-        else:
-            return render_template("userHome.html", user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False)
+    if session["role"] == "admin":
+        cursor = cur.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='results'")
+        if len(cursor.fetchall()) > 0:
+            cursor = cur.execute('SELECT MAX(points), nickname from results group by nickname')
+            results = cursor.fetchall()
+            cur.execute('DROP TABLE IF EXISTS tests')
+            cur.execute('DROP TABLE IF EXISTS questions')
+            cur.execute('DROP TABLE IF EXISTS users')
+            cur.execute('DROP TABLE IF EXISTS results')
+            cursor = cur.execute("SELECT login from logins")
+            logins = cursor.fetchall()
+            connection.close()
+            if len(results) != 0:
+                print (results)
+                if results[0][0] == 1:
+                    sentence = "punkt, a uzyskał go: "
+                elif results[0][0] == 2 or results[0][0] == 3 or results[0][0] == 4:
+                    sentence = "punkty, a uzyskał go: "
+                elif results[0][0] > 4 or results[0][0] == 0:
+                    sentence = "punktów, a uzyskał go: "  
+                return render_template("userHome.html", user=session['user'].split('@')[0] + "\nNajlepszy wynik z ostatniego testu wyniósł " + str(results[0][0]) + sentence + str(results[0][1]), calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False, logins = logins)
+            else:
+                return render_template("userHome.html", user=session['user'].split('@')[0], calendar_src="https://calendar.google.com/calendar/embed?src=" + session.get("user"), test = False, logins = logins)
     else:
         return render_template("error.html", error = "Brak dostępu!")
     
diff --git a/database.db b/database.db
index d3df4b9..f0c4506 100644
Binary files a/database.db and b/database.db differ
diff --git a/static/logo.jpg b/static/logo.jpg
index 515456b..82b6245 100644
Binary files a/static/logo.jpg and b/static/logo.jpg differ
diff --git a/templates/addEvent.html b/templates/addEvent.html
index cebcf5e..27e22a8 100644
--- a/templates/addEvent.html
+++ b/templates/addEvent.html
@@ -1,43 +1,45 @@
 <!DOCTYPE html>
+<!--<html lang="en">-->
 <html lang="pl-PL">
  
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <title>WU - wydarzenia</title>
+    <title>Python Flask App</title>
  
  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
+    <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
     <link href="../static/css/signup.css" rel="stylesheet">
     <link rel="stylesheet" href="../static/css/calendar.css">
-    <link rel="stylesheet" href="../static/style.css" type="text/css" />
-    <link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-
-    <script src="../static/timer.js"></script>
   
  
 </head>
  
-<body onload="odliczanie();">
+<body>
  
     <div class="container">
-        <div class="rectangle">
-            <div id="logo"><a href="/userHome" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div>
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/userHome" class="tile3link">Główna</a>
-            </div>
-            <div id="zegar">12:00:00</div>
-            <div style="clear: both;"></div>
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-left">
+                    <!--<form><input type="button" value="Back" onClick="history.go(-1);return true;"></form>-->
+                    <!--<li role="presentation" class="active"><input type="button" value="Back" onClick="history.go(-1);return true;">
+                    </li>-->
+                    <!--<li role="presentation" class="active"><form action="http://google.com"><input type="button" value="Wstecz" onClick="history.go(-1);return true;"></form></li>-->
+                    <li role="presentation" class="active"><a href="userHome">Wróć do strony domowej</a>
+                    </li>
+                </ul>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="/logout">Wyloguj</a>
+                    </li>
+                </ul>
+            </nav>
+            <h3 class="text-muted"><center>Python Flask</center></h3>
         </div>
-        <div style="clear:both;"></div>
-        <div class="square">
-            <div class="tile2">
-                <h2>Dodaj nowe wydarzenie do kalendarza</h2>
+ 
+        <div class="jumbotron" style="height: 550px;">
+           <h2>Dodaj nowe wydarzenie do kalendarza</h2>
            <div class="col-xs-12">
 
 
@@ -58,13 +60,15 @@
                 <input type="submit" value="Dodaj" style="margin-top: 5px; float: right;" class="btn btn-success"/></div>
             </form>
             </div>
-            </div>
-            <div style="clear: both;">
-            </div>
-            <div class="Foot">
-                Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-            </div>
+
         </div>
+        
+        
+        
+ 
+        <footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
  
     </div>
 </body>
diff --git a/templates/add_question.html b/templates/add_question.html
index 48eb03e..1a44684 100644
--- a/templates/add_question.html
+++ b/templates/add_question.html
@@ -1,44 +1,132 @@
 <!DOCTYPE html>
+<!--<html lang="en">-->
 <html lang="pl-PL">
  
 <head>
     <meta charset="UTF-8">
-    <title>WU - Testy</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <title>Python Flask App</title>
  
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
-    <link rel="stylesheet" href="../static/style.css" type="text/css" />
-	<link rel="stylesheet" href="../static/fontello-1e13f6ba/css/fontello.css" type="text/css" />
-	<link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-	
-	<script src="../static/timer.js"></script>
+    <link rel="stylesheet" type="text/css" href="signup.css">
+    <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
     <link href="../static/css/signup.css" rel="stylesheet">
     <link rel="stylesheet" href="../static/css/calendar.css">
+  <style>
+table, td, th {    
+    border: 1px solid;
+    text-align: left;
+}
+
+table {
+    border-collapse: collapse;
+    /*width: 100%;*/
+}
+
+th, td {
+    padding: 5px;
+}
+
+ul {list-style-type: none;}
+body {font-family: Verdana, sans-serif;}
+
+/* Month header */
+.month {
+    /*padding: 70px 25px;*/
+    width: 100%;
+    background: #1abc9c;
+    text-align: center;
+}
+
+/* Month list */
+.month ul {
+    margin: 0;
+    padding: 0;
+}
+
+.month ul li {
+    color: white;
+    font-size: 20px;
+    text-transform: uppercase;
+    letter-spacing: 3px;
+}
+
+/* Previous button inside month header */
+.month .prev {
+    float: left;
+    padding-top: 10px;
+}
+
+/* Next button */
+.month .next {
+    float: right;
+    padding-top: 10px;
+}
+
+/* Weekdays (Mon-Sun) */
+.weekdays {
+    margin: 0;
+    padding: 10px 0;
+    background-color:#ddd;
+}
+
+.weekdays li {
+    display: inline-block;
+    width: 13.6%;
+    color: #666;
+    text-align: center;
+}
+
+/* Days (1-30) */
+.days {
+    padding: 10px 0;
+    background: cyan;
+    margin: 0;
+}
+
+.days li {
+    list-style-type: none;
+    display: inline-block;
+    width: 13.6%;
+    text-align: center;
+    margin-bottom: 5px;
+    font-size:12px;
+    color: #777;
+}
+
+/* Highlight the "current" day */
+.days li .active {
+    padding: 5px;
+    background: #1abc9c;
+    color: white !important
+}
+</style>
  
 </head>
  
-<body onload="odliczanie();">
+<body>
  
     <div class="container">
-        <div class="rectangle">
-            <div id="logo"><a href="/" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div>
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/" class="tile3link">Główna</a>
-            </div>
-            <div id="zegar">12:00:00</div>
-            <div style="clear: both;"></div>
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-left">
+                    <li><img src="/static/logo.jpg" alt="Logo" height="150" width="150" border="5" style="padding: 25px;"></li>
+                    <!--<form><input type="button" value="Back" onClick="history.go(-1);return true;"></form>-->
+                    <!--<li role="presentation" class="active"><input type="button" value="Back" onClick="history.go(-1);return true;">
+                    </li>-->
+                    <!--<li role="presentation" class="active"><form action="http://google.com"><input type="button" value="Wstecz" onClick="history.go(-1);return true;"></form></li>-->
+                </ul>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="/logout">Wyloguj</a>
+                    </li>
+                </ul>
+            </nav>
+            <h3 class="text-muted"><center>Python Flask</center></h3>
         </div>
-        <div class="square"></div>
-		<div style="clear:both;"></div>
-		<div class="square">
-			<div class="tile2">
-				<h1>{{test_title}}</h1>
+ 
+        <div class="jumbotron" style="height: 550px;">
+           <h1>{{test_title}}</h1>
            <p class="lead"></p>
            <p>
             <!-- <a class="btn btn-lg btn-success" href="#" role="button">Moje zajęcia</a> -->
@@ -61,29 +149,16 @@
             <!-- <input type="submit" value="Wejdź na czat grupowy" /> -->
         <!-- </form> -->
            </p>
-			</div>
-
-            <div style="clear: both;">
-            </div>
-            <div class="Foot">
-                Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-            </div>
-        </div>
-        
         </div>
         
         
         
-        
-        
-        
-        
-        
-        
-        
-        
-        
-       
+ 
+        <footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
+ 
+    </div>
 </body>
  
 </html>
\ No newline at end of file
diff --git a/templates/chat.html b/templates/chat.html
index 38a0cf3..d25336a 100644
--- a/templates/chat.html
+++ b/templates/chat.html
@@ -1,24 +1,19 @@
 <!DOCTYPE html>
+<!--<html lang="en">-->
 <html lang="pl-PL">
  
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	
-	<title>WU - chat</title>
-	<link rel="stylesheet" href="../static/style.css" type="text/css" />
-	<link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-	
-	<script src="../static/timer.js"></script>
+    <title>Python Flask App</title>
  
  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
     <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
     <link href="../static/css/signup.css" rel="stylesheet">
     <link rel="stylesheet" href="../static/css/calendar.css">
-    
+  
 
 <script type="text/javascript" src="//code.jquery.com/jquery-1.4.2.min.js"></script>
         <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/socket.io/1.3.6/socket.io.min.js"></script>
@@ -61,36 +56,39 @@
  
 </head>
  
-<body onload="odliczanie();">
+<body>
  
     <div class="container">
-        <div class="rectangle">
-			<div id="logo"><a href="/userHome" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div>
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/userHome" class="tile3link">Główna</a>
-            </div>
-			<div id="zegar">12:00:00</div>
-			<div style="clear: both;"></div>
-		</div>
-		<div style="clear:both;"></div>
-		<div class="square">
-			<div class="tile2">
-				<h1>{{ room }}</h1>
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-left">
+                    <!--<form><input type="button" value="Back" onClick="history.go(-1);return true;"></form>-->
+                    <!--<li role="presentation" class="active"><input type="button" value="Back" onClick="history.go(-1);return true;">
+                    </li>-->
+                    <!--<li role="presentation" class="active"><form action="http://google.com"><input type="button" value="Wstecz" onClick="history.go(-1);return true;"></form></li>-->
+                    <li role="presentation" class="active"><a href="/userHome">Wstecz</a>
+                    </li>
+                </ul>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="/logout">Wyloguj</a>
+                    </li>
+                </ul>
+            </nav>
+            <h3 class="text-muted"><center>Python Flask</center></h3>
+        </div>
+ 
+        <div class="jumbotron" style="height: 550px;">
+           <h1>{{ room }}</h1>
         <textarea readonly id="chat" cols="80" rows="15"></textarea><br><br>
         <input id="text" size="80" placeholder="Tutaj wpisz swoją wiadomość"><br><br>
         <a href="#" onclick="leave_room();" style="border:1px;">Wyjdź z czatu</a>
-			</div>
-		<div style="clear: both;">
-		</div>
-		<div class="Foot">
-		Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-		</div>
-	</div>
- </div>
         
+ 
+        
+ 
+    </div><footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
 </body>
  
 </html>
\ No newline at end of file
diff --git a/templates/end_test.html b/templates/end_test.html
index 943b607..2e3f3cd 100644
--- a/templates/end_test.html
+++ b/templates/end_test.html
@@ -7,12 +7,101 @@
     <title>Python Flask App</title>
  
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
     <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
     <link href="../static/css/signup.css" rel="stylesheet">
     <link rel="stylesheet" href="../static/css/calendar.css">
+  <style>
+table, td, th {    
+    border: 1px solid;
+    text-align: left;
+}
+
+table {
+    border-collapse: collapse;
+    /*width: 100%;*/
+}
+
+th, td {
+    padding: 5px;
+}
+
+ul {list-style-type: none;}
+body {font-family: Verdana, sans-serif;}
+
+/* Month header */
+.month {
+    /*padding: 70px 25px;*/
+    width: 100%;
+    background: #1abc9c;
+    text-align: center;
+}
+
+/* Month list */
+.month ul {
+    margin: 0;
+    padding: 0;
+}
+
+.month ul li {
+    color: white;
+    font-size: 20px;
+    text-transform: uppercase;
+    letter-spacing: 3px;
+}
+
+/* Previous button inside month header */
+.month .prev {
+    float: left;
+    padding-top: 10px;
+}
+
+/* Next button */
+.month .next {
+    float: right;
+    padding-top: 10px;
+}
+
+/* Weekdays (Mon-Sun) */
+.weekdays {
+    margin: 0;
+    padding: 10px 0;
+    background-color:#ddd;
+}
+
+.weekdays li {
+    display: inline-block;
+    width: 13.6%;
+    color: #666;
+    text-align: center;
+}
+
+/* Days (1-30) */
+.days {
+    padding: 10px 0;
+    background: cyan;
+    margin: 0;
+}
+
+.days li {
+    list-style-type: none;
+    display: inline-block;
+    width: 13.6%;
+    text-align: center;
+    margin-bottom: 5px;
+    font-size:12px;
+    color: #777;
+}
+
+/* Highlight the "current" day */
+.days li .active {
+    padding: 5px;
+    background: #1abc9c;
+    color: white !important
+}
+</style>
  
 </head>
  
diff --git a/templates/error.html b/templates/error.html
index e92c603..cfe9057 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -3,16 +3,10 @@
  
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	
-	<title>WU - error</title>
-	<link rel="stylesheet" href="../static/style.css" type="text/css" />
-	<link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-	
-	<script src="../static/timer.js"></script>
+    <title>Nieautoryzowany Dostęp:: Python Flask App</title>
  
  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
     <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
@@ -20,33 +14,38 @@
  
 </head>
  
-<body onload="odliczanie();">
+<body>
  
     <div class="container">
-        <div class="rectangle">
-			<div id="logo"><a href="/" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div>
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/" class="tile3link">Główna</a>
-            </div>
-			<div id="zegar">12:00:00</div>
-			<div style="clear: both;"></div>
-		</div>
-		<div style="clear:both;"></div>
-		<div class="square">
-			<div class="tile2">
-				<h1>{{error}}</h1>
-			</div>
-		<div style="clear: both;">
-		</div>
-		<div class="Foot">
-		Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-		</div>
-	</div>
- </div>
-
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-left">
+                    <li role="presentation" class="active"><a href="javascript:history.back()">Wstecz</a>
+                    </li>
+                </ul>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="/">Strona główna</a>
+                    </li>
+                    <li role="presentation"><a href="/showSignIn">Zaloguj się</a>
+                    </li>
+                    <li role="presentation"><a href="/showSignUp">Zarejestruj się</a>
+                    </li>
+                </ul>
+            </nav>
+            <h3 class="text-muted"><center>Python Flask</center></h3>
+        </div>
+ 
+        <div class="jumbotron">
+            <h1>{{error}}</h1>
+        </div>
+ 
+ 
+ 
+        <footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
+ 
+    </div>
 </body>
  
 </html>
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 574e6a6..c5e9f93 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,14 +4,9 @@
  
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	
-	<title>WU - index</title>
-	<link rel="stylesheet" href="../static/style.css" type="text/css" />
-	<link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-	
-	<script src="../static/timer.js"></script>
-
+    <title>Python Flask App</title>
+ 
+    <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="signup.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
@@ -25,29 +20,31 @@
 <body>
  
     <div class="container">
-        <div class="rectangle">
-			<div id="logo"><a href="#" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div>
-            <div class="tile3">
-                <a href="showSignIn" class="tile3link">Zaloguj się</a>
-            </div>
-            <div class="tile3">
-                <a href="#" class="tile3link">Główna</a>
-            </div>
-			<div id="zegar">12:00:00</div>
-			<div style="clear: both;"></div>
-		</div>
-		<div style="clear:both;"></div>
-		<div class="square">
-			<div class="tile2">
-				<h1>Wirtualna Uczelnia</h1>
-                <h2>{{ info }}</h2>
-			</div>
-		<div style="clear: both;">
-		</div>
-		<div class="Foot">
-		Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-		</div>
-	</div>
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="#">Strona główna</a>
+                    </li>
+                    <li role="presentation"><a href="showSignIn">Zaloguj się</a>
+                    </li>
+                    <!-- <li role="presentation"><a href="showSignUp">Zarejestruj się</a> -->
+                    <!-- </li> -->
+                </ul>
+            </nav>
+            <h3 class="text-muted">Python Flask</h3>
+        </div>
+ 
+        <div class="jumbotron">
+            <h1>Aplikacja Testowa</h1>
+            <!-- <p class="lead"></p> -->
+            <!-- <p><a class="btn btn-lg btn-success" href="showSignUp" role="button">Rejestracja</a> -->
+            <!-- </p> -->
+            <h2>{{ info }}</h2>
+        </div>
+ 
+        <footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
  
     </div>
 </body>
diff --git a/templates/logo.jpg b/templates/logo.jpg
new file mode 100644
index 0000000..82b6245
Binary files /dev/null and b/templates/logo.jpg differ
diff --git a/templates/resources.html b/templates/resources.html
index 2f6242c..66564b1 100644
--- a/templates/resources.html
+++ b/templates/resources.html
@@ -4,17 +4,11 @@
  
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-
-    <title>WU - materiały</title>
-    <link rel="stylesheet" href="../static/style.css" type="text/css" />
-    <link rel="stylesheet" href="../static/fontello-1e13f6ba/css/fontello.css" type="text/css" />
-    <link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-
-    <script src="../static/timer.js"></script>
+    <title>Python Flask App</title>
  
  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
+    <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
     <link href="../static/css/signup.css" rel="stylesheet">
@@ -23,36 +17,30 @@
  
 </head>
  
-<body onload="odliczanie();">
+<body>
  
     <div class="container">
-        <div class="rectangle">
-            <div id="logo"><a href="/userHome" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div>
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/userHome" class="tile3link">Główna</a>
-            </div>
-            <div id="zegar">12:00:00</div>
-            <div style="clear: both;"></div>
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-left">
+                    <!--<form><input type="button" value="Back" onClick="history.go(-1);return true;"></form>-->
+                    <!--<li role="presentation" class="active"><input type="button" value="Back" onClick="history.go(-1);return true;">
+                    </li>-->
+                    <!--<li role="presentation" class="active"><form action="http://google.com"><input type="button" value="Wstecz" onClick="history.go(-1);return true;"></form></li>-->
+                    <li role="presentation" class="active"><a href="userHome">Wróć do strony domowej</a>
+                    </li>
+                </ul>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="/logout">Wyloguj</a>
+                    </li>
+                </ul>
+            </nav>
+            <h3 class="text-muted"><center>Python Flask</center></h3>
         </div>
-        <div class="square">
-            <div class="wrapper">
-                
+ 
+        <div class="jumbotron" style="height: 550px;">
+           <h1>Wszystkie materiały uczelni</h1>
             <div class="col-xs-6">
-                <h3>Wrzuć materiał</h3>
-                <form action="resources" method="post" enctype="multipart/form-data">
-                    <input type="file" name="fileToUpload" id="fileToUpload">
-                    <input type="submit" value="Przekaż plik" name="submit">
-                </form>
-            </div>
-            </div>
-        </div>
-        <div style="clear:both;"></div>
-        <div class="square">
-            <div class="tile2">
-               <h1>Wszystkie materiały uczelni</h1>
                 <h2>Materiały do pobrania:</h2>
                 <!-- <form action="downloadResource" method="get" enctype="multipart/form-data"> -->
                 
@@ -67,14 +55,37 @@
                             {% endfor %}
                         {% endif %}
                     {% endfor %}
+                
+                    <!-- {% for item in items %} -->
+                        <!-- item.children -->
+                        <!-- <ul><a href="{{ item.children }}">{{ item.children }}</a></ul> -->
+                    <!-- {% endfor %} -->
+                    
+                    <!-- {% for file in files %} -->
+                        <!-- file</br> -->
+                        <!-- <ol><a href="{{ resource }}" download>Plik</a></ol> -->
+                    <!-- {% endfor %} -->
+                <!-- </form> -->
             </div>
-            <div style="clear: both;">
-            </div>
-            <div class="Foot">
-                Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
+            <div class="col-xs-6">
+                Materiał tygodnia:
+                <a href="https://eduwiki.wmi.amu.edu.pl/jassem">Polecamy</a>
+                <h3>Wrzuć materiał</h3>
+                <form action="resources" method="post" enctype="multipart/form-data">
+                    <input type="file" name="fileToUpload" id="fileToUpload">
+                    <input type="submit" value="Przekaż plik" name="submit">
+                </form>
             </div>
+
+
         </div>
         
+        
+        
+ 
+        <footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
  
     </div>
 </body>
diff --git a/templates/signin.html b/templates/signin.html
index 802bdc4..1143110 100644
--- a/templates/signin.html
+++ b/templates/signin.html
@@ -1,17 +1,12 @@
 <!DOCTYPE html>
 <html lang="pl-PL">
+<!--html lang="en">-->
   <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-
-    <title>WU - logowanie</title>
-    <link rel="stylesheet" href="../static/style.css" type="text/css" />
-    <link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-
-    <script src="../static/timer.js"></script>
+    <title>Python Flask App</title>
  
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
     <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
@@ -40,40 +35,41 @@
   <body>
  
     <div class="container">
-        <div class="rectangle">
-            <div id="logo"><a href="/userHome" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div> 
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/userHome" class="tile3link">Główna</a> 
-            </div>
-            <div id="zegar">12:00:00</div>
-            <div style="clear: both;"></div>
-        </div>
-        <div style="clear:both;"></div>
-        <div class="square">
-            <div class="tile2">
-                <h1>Aplikacja Testowa</h1>
+      <div class="header">
+        <nav>
+          <ul class="nav nav-pills pull-left">
+            <li role="presentation" class="active"><a href="javascript:history.back()">Wstecz</a>
+            </li>
+          </ul>
+          <ul class="nav nav-pills pull-right">
+            <li role="presentation" ><a href="/">Strona główna</a></li>
+            <li role="presentation" class="active"><a href="#">Zaloguj się</a></li>
+            <!-- <li role="presentation" ><a href="/showSignUp">Zarejestruj się</a></li> -->
+          </ul>
+        </nav>
+        <h3 class="text-muted"><center>Python Flask</center></h3>
+      </div>
+ 
+      <div class="jumbotron">
+        <h1>Aplikacja Testowa</h1>
         <form class="form-signin" action="/validateLogin" method="post">
         <label for="inputLogin" class="sr-only">Nazwa użytkownika</label>
         <input type="text" name="inputLogin" id="inputLogin" class="form-control" placeholder="Wpisz nazwę" required autofocus>
         <label for="inputPassword" class="sr-only">Hasło</label>
         <input type="password" name="inputPassword" id="inputPassword" class="form-control" placeholder="Wpisz hasło" required>
-        <input type="submit" value="Zaloguj się normalnie"></input>
+        <input type="submit" value="Zaloguj się"></input>
         <!-- <button id="btnSignIn" class="btn btn-lg btn-primary btn-block" type="submit">Potwierdź logowanie</button> -->
       </form>
-      <form class="form-signin" action="/signInWithFace" method="get">
-         <input type="submit" value="Zaloguj się za pomocą twarzy"></input>
-      </form>
-            </div>
-            <div style="clear: both;">
-            </div>
-            <div class="Foot">
-                Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-            </div>
-        </div>
-
+      <!-- <form class="form-signin" action="/signInWithFace" method="get"> -->
+         <!-- <input type="submit" value="Zaloguj się za pomocą twarzy"></input> -->
+      <!-- </form> -->
+      </div>
+ 
+       
+ 
+      <footer class="footer">
+        <p>&copy; UAM 2018</p>
+      </footer>
  
     </div>
   </body>
diff --git a/templates/signup.html b/templates/signup.html
new file mode 100644
index 0000000..c227307
--- /dev/null
+++ b/templates/signup.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="pl-PL">
+<!--html lang="en">-->
+  <head>
+    <meta charset="UTF-8">
+    <title>Python Flask App</title>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
+    <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
+ 
+    <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
+    <link href="../static/signup.css" rel="stylesheet">
+    <script src="../static/js/jquery-1.12.3.min.js"></script>
+    
+    <!-- <script type="text/javascript"> -->
+    <!-- $(function() { -->
+        <!-- $('#btnSignUp').click(function() { -->
+     
+            <!-- $.ajax({ -->
+                <!-- url: '/signUp', -->
+                <!-- data: $('form').serialize(), -->
+                <!-- type: 'POST', -->
+                <!-- success: function(response) { -->
+                    <!-- console.log(response); -->
+                <!-- }, -->
+                <!-- error: function(error) { -->
+                    <!-- console.log(error); -->
+                <!-- } -->
+            <!-- }); -->
+        <!-- }); -->
+    <!-- }); -->
+    <!-- </script> -->
+    
+  </head>
+ 
+  <body>
+ 
+    <div class="container">
+      <div class="header">
+        <nav>
+          <ul class="nav nav-pills pull-left">
+            <li role="presentation" class="active"><a href="javascript:history.back()">Wstecz</a>
+            </li>
+          </ul>
+          <ul class="nav nav-pills pull-right">
+            <!--<li role="presentation" ><a href="main">Strona główna</a></li>-->
+            <li role="presentation" ><a href="/">Strona główna</a></li>
+            <li role="presentation"><a href="/showSignIn">Zaloguj się</a></li>
+            <li role="presentation" class="active"><a href="#">Zarejestruj się</a></li>
+          </ul>
+        </nav>
+        <h3 class="text-muted"><center>Python Flask</center></h3>
+      </div>
+ 
+      <div class="jumbotron">
+        <h1>Aplikacja Testowa</h1>
+        <form class="form-signin" action="/signUp" method="post">
+        <label for="inputLogin" class="sr-only">Login</label>
+        <input type="name" name="inputLogin" id="inputLogin" class="form-control" placeholder="Login" required autofocus>
+        <label for="inputPassword" class="sr-only">Password</label>
+        <input type="password" name="inputPassword" id="inputPassword" class="form-control" placeholder="Hasło" required>
+         <input type="submit" value="Zatwierdź"></input>
+        <!-- <button id="btnSignUp" class="btn btn-lg btn-primary btn-block" type="button">Potwierdź rejestrację</button> -->
+      </form>
+      <form class="form-signin" action="/signUpWithFace" method="get">
+
+         <input type="submit" value="Zatwierdź dane twarzy"></input>
+        <!-- <button id="btnSignUp" class="btn btn-lg btn-primary btn-block" type="button">Potwierdź rejestrację</button> -->
+      </form>
+      <!--<button id="btnSignUp" class="btn btn-lg btn-primary btn-block" type="button">Potwierdź rejestrację</button>-->
+      </div>
+ 
+       
+ 
+      <footer class="footer">
+        <p>&copy; UAM 2018</p>
+      </footer>
+ 
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/templates/streaming.html b/templates/streaming.html
index b7eb41a..d8debc9 100644
--- a/templates/streaming.html
+++ b/templates/streaming.html
@@ -1,58 +1,145 @@
 <!DOCTYPE html>
+<!--<html lang="en">-->
 <html lang="pl-PL">
  
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-
-    <title>WU - streamowanie</title>
-    <link rel="stylesheet" href="../static/style.css" type="text/css" />
-    <link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-
-    <script src="../static/timer.js"></script>
+    <title>Python Flask App</title>
  
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
     <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
     <link href="../static/css/signup.css" rel="stylesheet">
     <link rel="stylesheet" href="../static/css/calendar.css">
+  <style>
+table, td, th {    
+    border: 1px solid;
+    text-align: left;
+}
 
+table {
+    border-collapse: collapse;
+    /*width: 100%;*/
+}
+
+th, td {
+    padding: 5px;
+}
+
+ul {list-style-type: none;}
+body {font-family: Verdana, sans-serif;}
+
+/* Month header */
+.month {
+    /*padding: 70px 25px;*/
+    width: 100%;
+    background: #1abc9c;
+    text-align: center;
+}
+
+/* Month list */
+.month ul {
+    margin: 0;
+    padding: 0;
+}
+
+.month ul li {
+    color: white;
+    font-size: 20px;
+    text-transform: uppercase;
+    letter-spacing: 3px;
+}
+
+/* Previous button inside month header */
+.month .prev {
+    float: left;
+    padding-top: 10px;
+}
+
+/* Next button */
+.month .next {
+    float: right;
+    padding-top: 10px;
+}
+
+/* Weekdays (Mon-Sun) */
+.weekdays {
+    margin: 0;
+    padding: 10px 0;
+    background-color:#ddd;
+}
+
+.weekdays li {
+    display: inline-block;
+    width: 13.6%;
+    color: #666;
+    text-align: center;
+}
+
+/* Days (1-30) */
+.days {
+    padding: 10px 0;
+    background: cyan;
+    margin: 0;
+}
+
+.days li {
+    list-style-type: none;
+    display: inline-block;
+    width: 13.6%;
+    text-align: center;
+    margin-bottom: 5px;
+    font-size:12px;
+    color: #777;
+}
+
+/* Highlight the "current" day */
+.days li .active {
+    padding: 5px;
+    background: #1abc9c;
+    color: white !important
+}
+</style>
  
 </head>
  
-<body onload="odliczanie();">
+<body>
  
     <div class="container">
-        <div class="rectangle">
-            <div id="logo"><a href="/userHome" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div> 
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/userHome" class="tile3link">Główna</a> 
-            </div>
-            <div id="zegar">12:00:00</div>
-            <div style="clear: both;"></div>
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-left">
+                    <li><img src="/static/logo.jpg" alt="Logo" height="150" width="150" border="5" style="padding: 25px;"></li>
+                    <!--<form><input type="button" value="Back" onClick="history.go(-1);return true;"></form>-->
+                    <!--<li role="presentation" class="active"><input type="button" value="Back" onClick="history.go(-1);return true;">
+                    </li>-->
+                    <!--<li role="presentation" class="active"><form action="http://google.com"><input type="button" value="Wstecz" onClick="history.go(-1);return true;"></form></li>-->
+                </ul>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="/logout">Wyloguj</a>
+                    </li>
+                </ul>
+            </nav>
+            <h3 class="text-muted"><center>Python Flask</center></h3>
         </div>
-        <div style="clear:both;"></div>
-        <div class="square">
-            <div class="tile2">
-                <h1>Witaj w domu {{user}}!</h1>
+ 
+        <div class="jumbotron" style="height: 550px;">
+           <h1>Witaj w domu {{user}}!</h1>
            <div class="col-xs-12">
             <img id="bg" src="{{ url_for('stream') }}">
            </div>
            </p>
-            </div>
-            <div style="clear: both;">
-            </div>
-            <div class="Foot">
-                Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-            </div>
-
+        </div>
+        
+        
+        
+ 
+        <footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
  
- </div>
     </div>
 </body>
  
diff --git a/templates/test.html b/templates/test.html
index 232a5ff..475fac6 100644
--- a/templates/test.html
+++ b/templates/test.html
@@ -1,48 +1,44 @@
 <!DOCTYPE html>
+<!--<html lang="en">-->
 <html lang="pl-PL">
  
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	
-	<title>WU - Testy</title>
-	<link rel="stylesheet" href="../static/style.css" type="text/css" />
-	<link rel="stylesheet" href="../static/fontello-1e13f6ba/css/fontello.css" type="text/css" />
-	<link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-	
-	<script src="../static/timer.js"></script>
+    <title>Python Flask App</title>
  
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
     <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
     <link href="../static/css/signup.css" rel="stylesheet">
     <link rel="stylesheet" href="../static/css/calendar.css">
-  
+
  
 </head>
  
 <body>
  
     <div class="container">
-        <div class="rectangle">
-            <div id="logo"><a href="/userHome" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div>
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/userHome" class="tile3link">Główna</a>
-            </div>
-            <div id="zegar">12:00:00</div>
-            <div style="clear: both;"></div>
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-left">
+                    <li><img src="/static/logo.jpg" alt="Logo" height="150" width="150" border="5" style="padding: 25px;"></li>
+                    <!--<form><input type="button" value="Back" onClick="history.go(-1);return true;"></form>-->
+                    <!--<li role="presentation" class="active"><input type="button" value="Back" onClick="history.go(-1);return true;">
+                    </li>-->
+                    <!--<li role="presentation" class="active"><form action="http://google.com"><input type="button" value="Wstecz" onClick="history.go(-1);return true;"></form></li>-->
+                </ul>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="/logout">Wyloguj</a>
+                    </li>
+                </ul>
+            </nav>
+            <h3 class="text-muted"><center>Python Flask</center></h3>
         </div>
-		<div class="square">
-		</div>
-		<div style="clear:both;"></div>
-		<div class="square">
-			<div class="tile2">
-				<h1>{{test}}</h1>
+ 
+        <div class="jumbotron" style="height: 550px;">
+           <h1>{{test}}</h1>
            <form class="form-signin" action="/test" method="post">
            {% for question in questions %}
            <div class="col-xs-12">
@@ -65,14 +61,14 @@
            </div>
            {% endfor %}
            </form>
-			</div>
-
-		<div style="clear: both;">
-		</div>
-		<div class="Foot">
-		Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-		</div>
-	</div>
+        </div>
+        
+        
+        
+ 
+        <footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
  
     </div>
 </body>
diff --git a/templates/userHome.html b/templates/userHome.html
index 407f4b0..9321b90 100644
--- a/templates/userHome.html
+++ b/templates/userHome.html
@@ -1,61 +1,64 @@
 <!DOCTYPE html>
+<!--<html lang="en">-->
 <html lang="pl-PL">
  
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-	
-	<title>Wirtualna uczelnia</title>
-	<link rel="stylesheet" href="../static/style.css" type="text/css" />
-	<link rel="stylesheet" href="../static/fontello-1e13f6ba/css/fontello.css" type="text/css" />
-	<link href="https://fonts.googleapis.com/css?family=Happy+Monkey|Open+Sans+Condensed:300&amp;subset=latin-ext" rel="stylesheet">
-	
-	<script src="../static/timer.js"></script>
+    <title>Python Flask App</title>
  
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <link rel="stylesheet" type="text/css" href="../static/signup.css">
+    <link rel="stylesheet" type="text/css" href="signup.css">
     <!-- <link href="http://getbootstrap.com/dist/css/bootstrap.min.css" rel="stylesheet"> -->
  
     <link href="http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css" rel="stylesheet">
     <link href="../static/css/signup.css" rel="stylesheet">
     <link rel="stylesheet" href="../static/css/calendar.css">
-
  
 </head>
  
 <body>
  
     <div class="container">
-        <div class="rectangle">
-            <div id="logo"><a href="/userHome" class="tilelinkhtml5"><img src="../static/Wirtualna Uczelnia.png" alt="Wirtualna Uczelnia"></a></div>
-            <div class="tile3">
-                <a href="/logout" class="tile3link">Wyloguj</a>
-            </div>
-            <div class="tile3">
-                <a href="/userHome" class="tile3link">Główna</a>
-            </div>
-            <!-- <div class="tile3"> -->
-                <!-- <a href="lista" class="tile3link">Lista</a> <!--PODPIĘCIE LISTY OSóB--> -->
-            <!-- </div> -->
-            <div id="zegar">12:00:00</div>
-            <div style="clear: both;"></div>
+        <div class="header">
+            <nav>
+                <ul class="nav nav-pills pull-left">
+                    <li><img src="/static/logo.jpg" alt="Logo" height="150" width="150" border="5" style="padding: 25px;"></li>
+                    <!--<form><input type="button" value="Back" onClick="history.go(-1);return true;"></form>-->
+                    <!--<li role="presentation" class="active"><input type="button" value="Back" onClick="history.go(-1);return true;">
+                    </li>-->
+                    <!--<li role="presentation" class="active"><form action="http://google.com"><input type="button" value="Wstecz" onClick="history.go(-1);return true;"></form></li>-->
+                </ul>
+                <ul class="nav nav-pills pull-right">
+                    <li role="presentation" class="active"><a href="/logout">Wyloguj</a>
+                    </li>
+                </ul>
+            </nav>
+            <h3 class="text-muted"><center>Python Flask</center></h3>
         </div>
-		<div class="square">
-            <div class="wrapper">
-                <div class="tile1">
-                    <a href="chat" class="tilelink"><i class="icon-chat"></i><br /><br />Czat grupowy</a>
+ 
+        <div class="jumbotron" style="height: 550px;">
+           <h1>Witaj w domu {{user}}!</h1>
+           <div class="col-xs-8">
+           <!-- <iframe src="https://calendar.google.com/calendar/embed?src=micik220@gmail.com" style="border-width:0" width="500" height="350" frameborder="0" scrolling="no"></iframe> -->
+           <iframe src="{{ calendar_src }}" style="border-width:0" width="500" height="350" frameborder="0" scrolling="no"></iframe>
                 </div>
-                <div class="tile1">
-                    <a href="toAddEvent" class="tilelink"><i class="icon-calendar"></i><br /><br />Dodaj wydarzenie</a> 
-                </div>
-                <div class="tile1">
-                    <a href="toResources" class="tilelink"><i class="icon-folder-open"></i><br /><br />Materiały</a> 
-                </div>
-                <div class="tile1">
-                    <a href="stream" class="tilelink"><i class="icon-videocam"></i><br /><br />Uruchom testowy stream</a> 
-                </div>
-                <div class="tile1">
-                    {% if session['role'] == 'admin' %}
+           <div class="col-xs-4">
+           <p class="lead"></p>
+           <p>
+            <!-- <a class="btn btn-lg btn-success" href="#" role="button">Moje zajęcia</a> -->
+            <!-- <a class="btn btn-lg btn-success" href="#" role="button">Test</a> -->
+            <!-- <a class="btn btn-lg btn-success" href="#" role="button">Wyniki</a> -->
+            Użytkownicy uczelni:
+            {% for login in logins %}
+                {{ login[0] }}
+                </br>
+            {% endfor %}
+            <a class="btn btn-lg btn-success" href="toAddEvent" role="button">Dodaj wydarzenie</a>
+            <a class="btn btn-lg btn-success" href="chat" role="button" style="margin-top: 5px;">Czat grupowy</a>
+            <!-- <a class="btn btn-lg btn-success" href="toResources" role="button" style="margin-top: 5px;">Dodaj materiały</a> -->
+            <a class="btn btn-lg btn-success" href="toResources" role="button" style="margin-top: 5px;">Podejrzyj materiały</a>
+            <a class="btn btn-lg btn-success" href="stream" role="button" style="margin-top: 5px;">Uruchom testowy stream</a>
+            {% if session['role'] == 'admin' %}
                 {% if test %}
                     <form class="form-signin" action="/end_test" method="post">
                         <input class="btn btn-lg btn-success" type="submit" value="Zakończ trwający test"></input>
@@ -72,23 +75,19 @@
                         <input class="btn btn-lg btn-success" type="submit" value="Rozwiąż test"></input>
                     </form>
             {% endif %}
-                    <!-- <a href="test.html" class="tilelink"><i class="icon-edit"></i><br /><br />Test</a>  -->
-                </div>
-                <div style="clear:both;"></div>
-            </div>
-		</div>
-		<div style="clear:both;"></div>
-		<div class="square">
-			<div class="tile2">
-				<iframe src="{{ calendar_src }}" style="border-width:0" width="500" height="350" frameborder="0" scrolling="no"></iframe>
-			</div>
-		<div style="clear: both;">
-		</div>
-		<div class="Foot">
-		Wykonawcy projektu: Eryka Przewoźnik, Beata Dylewska, Adrianna Ubych, Maciej Mieszczyński, Jakub Rezler
-		</div>
-	</div>
-
+            <!-- <form action="ch"> -->
+            <!-- <input type="submit" value="Wejdź na czat grupowy" /> -->
+        <!-- </form> -->
+           </p>
+           </div>
+        </div>
+        
+        
+        
+ 
+        <footer class="footer">
+            <p>&copy; UAM 2018</p>
+        </footer>
  
     </div>
 </body>
diff --git a/token.json b/token.json
index ff34178..278ff2a 100644
--- a/token.json
+++ b/token.json
@@ -1 +1 @@
-{"access_token": "ya29.GltvBjJUQJa7byeuf8v3JCkjwtevLdEkDEAxeXytM542WScD1GrhdCU7MI7lgx74qV3b_Q4S5D0nAK8PQnqEC9yiUsYt16-vXHZ0oyZd2I6jlQNtmr0yma8UkSpn", "client_id": "566304981572-9hr3g1k77etvjovjr4qbordioblum93q.apps.googleusercontent.com", "client_secret": "4ym9H4hS-IURN5BhxytXzb6J", "refresh_token": "1/me1ZoXCKxkQuOW00ZUc0pNsFCQ9bjVnpY7SuFsetBv7DiONcLVMEwgcbw830I542", "token_expiry": "2018-12-11T20:44:33Z", "token_uri": "https://www.googleapis.com/oauth2/v3/token", "user_agent": null, "revoke_uri": "https://oauth2.googleapis.com/revoke", "id_token": null, "id_token_jwt": null, "token_response": {"access_token": "ya29.GltvBjJUQJa7byeuf8v3JCkjwtevLdEkDEAxeXytM542WScD1GrhdCU7MI7lgx74qV3b_Q4S5D0nAK8PQnqEC9yiUsYt16-vXHZ0oyZd2I6jlQNtmr0yma8UkSpn", "expires_in": 3600, "refresh_token": "1/me1ZoXCKxkQuOW00ZUc0pNsFCQ9bjVnpY7SuFsetBv7DiONcLVMEwgcbw830I542", "scope": "https://www.googleapis.com/auth/calendar.events", "token_type": "Bearer"}, "scopes": ["https://www.googleapis.com/auth/calendar.events"], "token_info_uri": "https://oauth2.googleapis.com/tokeninfo", "invalid": false, "_class": "OAuth2Credentials", "_module": "oauth2client.client"}
\ No newline at end of file
+{"access_token": "ya29.Gl2TBtuhQqKZY85CLAAjQqyotga7qoZqxpNZJweyjwCNUoTXktKClV93u31E65AB_xwd3cnuckh-wr8BbY_wcMg2QW4XpyvJEbIh-F4YwhKw184lvREmbgO4M2eSGlU", "client_id": "566304981572-9hr3g1k77etvjovjr4qbordioblum93q.apps.googleusercontent.com", "client_secret": "4ym9H4hS-IURN5BhxytXzb6J", "refresh_token": "1/me1ZoXCKxkQuOW00ZUc0pNsFCQ9bjVnpY7SuFsetBv7DiONcLVMEwgcbw830I542", "token_expiry": "2019-01-16T14:37:28Z", "token_uri": "https://www.googleapis.com/oauth2/v3/token", "user_agent": null, "revoke_uri": "https://oauth2.googleapis.com/revoke", "id_token": null, "id_token_jwt": null, "token_response": {"access_token": "ya29.Gl2TBtuhQqKZY85CLAAjQqyotga7qoZqxpNZJweyjwCNUoTXktKClV93u31E65AB_xwd3cnuckh-wr8BbY_wcMg2QW4XpyvJEbIh-F4YwhKw184lvREmbgO4M2eSGlU", "expires_in": 3600, "scope": "https://www.googleapis.com/auth/calendar.events", "token_type": "Bearer"}, "scopes": ["https://www.googleapis.com/auth/calendar.events"], "token_info_uri": "https://oauth2.googleapis.com/tokeninfo", "invalid": false, "_class": "OAuth2Credentials", "_module": "oauth2client.client"}
\ No newline at end of file