Merge branch 'master' of 192.168.15.97:codeq-problems

Conflicts:
	python/problems/while_and_if/checking_account/en.py
	python/problems/while_and_if/consumers_anonymous/en.py

40 files changed, 5 insertions, 36 deletions

diff --git a/python/problems/functions/common.py b/python/problems/functions/common.py
new file mode 100644
index 0000000..1367877
--- /dev/null
+++ b/python/problems/functions/common.py
@@ -0,0 +1 @@
+id = 17
diff --git a/python/problems/functions/greatest/en.py b/python/problems/functions/greatest/en.py
index 8a0c883..acf4672 100644
--- a/python/problems/functions/greatest/en.py
+++ b/python/problems/functions/greatest/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 195
 name = 'Maximum number'
 slug = 'Maximum number'
 
diff --git a/python/problems/functions/greatest/sl.py b/python/problems/functions/greatest/sl.py
index a7916a5..12e07fe 100644
--- a/python/problems/functions/greatest/sl.py
+++ b/python/problems/functions/greatest/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 195
 name = 'Največji'
 slug = 'Največji'
 
diff --git a/python/problems/functions/greatest_absolutist/en.py b/python/problems/functions/greatest_absolutist/en.py
index 03614e7..1ede4a9 100644
--- a/python/problems/functions/greatest_absolutist/en.py
+++ b/python/problems/functions/greatest_absolutist/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 196
 name = 'Greatest absolutist'
 slug = 'Greatest absolutist'
 
diff --git a/python/problems/functions/greatest_absolutist/sl.py b/python/problems/functions/greatest_absolutist/sl.py
index ee33c6d..a45f483 100644
--- a/python/problems/functions/greatest_absolutist/sl.py
+++ b/python/problems/functions/greatest_absolutist/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 196
 name = 'Največji absolutist'
 slug = 'Največji absolutist'
 
diff --git a/python/problems/functions/greatest_negative/en.py b/python/problems/functions/greatest_negative/en.py
index a57cb1f..5c2919a 100644
--- a/python/problems/functions/greatest_negative/en.py
+++ b/python/problems/functions/greatest_negative/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 197
 name = 'Greatest negativist'
 slug = 'Greatest negativist'
 
diff --git a/python/problems/functions/greatest_negative/sl.py b/python/problems/functions/greatest_negative/sl.py
index ea1e47c..31f1fd6 100644
--- a/python/problems/functions/greatest_negative/sl.py
+++ b/python/problems/functions/greatest_negative/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 197
 name = 'Največji negativec'
 slug = 'Največji negativec'
 
diff --git a/python/problems/introduction/average/en.py b/python/problems/introduction/average/en.py
index 7742a7d..5ce621e 100644
--- a/python/problems/introduction/average/en.py
+++ b/python/problems/introduction/average/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 1000
 name = 'Average grade'
 slug = 'Average grade'
 
diff --git a/python/problems/introduction/average/sl.py b/python/problems/introduction/average/sl.py
index d7eafbb..540a9cc 100644
--- a/python/problems/introduction/average/sl.py
+++ b/python/problems/introduction/average/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 189
 name = 'Povprečna ocena'
 slug = 'Povprečna ocena'
 
diff --git a/python/problems/introduction/ballistics/en.py b/python/problems/introduction/ballistics/en.py
index 34dca8a..6fab80f 100644
--- a/python/problems/introduction/ballistics/en.py
+++ b/python/problems/introduction/ballistics/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 1000
 name = 'Ballistics'
 slug = 'Ballistics'
 
diff --git a/python/problems/introduction/ballistics/sl.py b/python/problems/introduction/ballistics/sl.py
index fa0fe5d..ee073f8 100644
--- a/python/problems/introduction/ballistics/sl.py
+++ b/python/problems/introduction/ballistics/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 187
 name = 'Topologija'
 slug = 'Topologija'
 
diff --git a/python/problems/introduction/common.py b/python/problems/introduction/common.py
new file mode 100644
index 0000000..8498d9c
--- /dev/null
+++ b/python/problems/introduction/common.py
@@ -0,0 +1,2 @@
+id = 13
+number = 1
diff --git a/python/problems/introduction/fahrenheit_to_celsius/en.py b/python/problems/introduction/fahrenheit_to_celsius/en.py
index a2af212..5d7522e 100644
--- a/python/problems/introduction/fahrenheit_to_celsius/en.py
+++ b/python/problems/introduction/fahrenheit_to_celsius/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 180
 name = 'Converting Fahrenheit to Celsius'
 slug = 'Converting Fahrenheit to Celsius'
 
diff --git a/python/problems/introduction/fahrenheit_to_celsius/sl.py b/python/problems/introduction/fahrenheit_to_celsius/sl.py
index ae3db5f..f5ce4a4 100644
--- a/python/problems/introduction/fahrenheit_to_celsius/sl.py
+++ b/python/problems/introduction/fahrenheit_to_celsius/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 180
 name = 'Pretvarjanje iz Fahrenheitov v Celzije'
 slug = 'Pretvarjanje iz Fahrenheitov v Celzije'
 
diff --git a/python/problems/introduction/fast_fingers/en.py b/python/problems/introduction/fast_fingers/en.py
index de07494..ab4637a 100644
--- a/python/problems/introduction/fast_fingers/en.py
+++ b/python/problems/introduction/fast_fingers/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 1000
 name = 'Fast fingers'
 slug = 'Fast fingers'
 
diff --git a/python/problems/introduction/fast_fingers/sl.py b/python/problems/introduction/fast_fingers/sl.py
index 0b38a3a..c181951 100644
--- a/python/problems/introduction/fast_fingers/sl.py
+++ b/python/problems/introduction/fast_fingers/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 190
 name = 'Hitri prsti'
 slug = 'Hitri prsti'
 
diff --git a/python/problems/introduction/fast_fingers_2/en.py b/python/problems/introduction/fast_fingers_2/en.py
index 636f4d0..2172127 100644
--- a/python/problems/introduction/fast_fingers_2/en.py
+++ b/python/problems/introduction/fast_fingers_2/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 1000
 name = 'Fast fingers 2'
 slug = 'Fast fingers 2'
 
diff --git a/python/problems/introduction/fast_fingers_2/sl.py b/python/problems/introduction/fast_fingers_2/sl.py
index 125bd24..6606fbe 100644
--- a/python/problems/introduction/fast_fingers_2/sl.py
+++ b/python/problems/introduction/fast_fingers_2/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 191
 name = 'Hitri prsti 2'
 slug = 'Hitri prsti 2'
 
diff --git a/python/problems/introduction/pythagorean_theorem/en.py b/python/problems/introduction/pythagorean_theorem/en.py
index b3c6117..79d7e39 100644
--- a/python/problems/introduction/pythagorean_theorem/en.py
+++ b/python/problems/introduction/pythagorean_theorem/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 1000
 name = 'Pythagorean theorem'
 slug = 'Pythagorean theorem'
 
diff --git a/python/problems/introduction/pythagorean_theorem/sl.py b/python/problems/introduction/pythagorean_theorem/sl.py
index 21aec9a..9500651 100644
--- a/python/problems/introduction/pythagorean_theorem/sl.py
+++ b/python/problems/introduction/pythagorean_theorem/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 188
 name = 'Pitagorov izrek'
 slug = 'Pitagorov izrek'
 
diff --git a/python/problems/lists_and_for/common.py b/python/problems/lists_and_for/common.py
new file mode 100644
index 0000000..b490107
--- /dev/null
+++ b/python/problems/lists_and_for/common.py
@@ -0,0 +1 @@
+id = 16
diff --git a/python/problems/lists_and_for/contains_42/en.py b/python/problems/lists_and_for/contains_42/en.py
index 805b37c..7794063 100644
--- a/python/problems/lists_and_for/contains_42/en.py
+++ b/python/problems/lists_and_for/contains_42/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 193
 name = 'Contains 42'
 slug = 'Contains 42'
 
diff --git a/python/problems/lists_and_for/contains_42/sl.py b/python/problems/lists_and_for/contains_42/sl.py
index 245d346..65353a7 100644
--- a/python/problems/lists_and_for/contains_42/sl.py
+++ b/python/problems/lists_and_for/contains_42/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 193
 name = 'Vsebuje'
 slug = 'Vsebuje'
 
diff --git a/python/problems/lists_and_for/contains_string/en.py b/python/problems/lists_and_for/contains_string/en.py
index fa17867..b57be95 100644
--- a/python/problems/lists_and_for/contains_string/en.py
+++ b/python/problems/lists_and_for/contains_string/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 194
 name = 'Contains string'
 slug = 'Contains string'
 
diff --git a/python/problems/lists_and_for/contains_string/sl.py b/python/problems/lists_and_for/contains_string/sl.py
index 49f0ed0..7061c59 100644
--- a/python/problems/lists_and_for/contains_string/sl.py
+++ b/python/problems/lists_and_for/contains_string/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 194
 name = 'Vsebuje niz'
 slug = 'Vsebuje niz'
 
diff --git a/python/problems/lists_and_for/counting/en.py b/python/problems/lists_and_for/counting/en.py
index 19568e3..223a611 100644
--- a/python/problems/lists_and_for/counting/en.py
+++ b/python/problems/lists_and_for/counting/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 203
 name = 'Counting'
 slug = 'Counting'
 
diff --git a/python/problems/lists_and_for/counting/sl.py b/python/problems/lists_and_for/counting/sl.py
index c2fc820..926d2c6 100644
--- a/python/problems/lists_and_for/counting/sl.py
+++ b/python/problems/lists_and_for/counting/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 203
 name = 'Štej'
 slug = 'Štej'
 
diff --git a/python/problems/lists_and_for/divisors/en.py b/python/problems/lists_and_for/divisors/en.py
index e98e9a7..8f4dbeb 100644
--- a/python/problems/lists_and_for/divisors/en.py
+++ b/python/problems/lists_and_for/divisors/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 204
 name = 'Divisors'
 slug = 'Divisors'
 
diff --git a/python/problems/lists_and_for/divisors/sl.py b/python/problems/lists_and_for/divisors/sl.py
index 3edf2bb..f79875a 100644
--- a/python/problems/lists_and_for/divisors/sl.py
+++ b/python/problems/lists_and_for/divisors/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 204
 name = 'Delitelji'
 slug = 'Delitelji'
 
diff --git a/python/problems/while_and_if/buy_five/en.py b/python/problems/while_and_if/buy_five/en.py
index 7e522da..9ad1f06 100644
--- a/python/problems/while_and_if/buy_five/en.py
+++ b/python/problems/while_and_if/buy_five/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 185
 name = 'Buy five'
 slug = 'Buy five'
 
diff --git a/python/problems/while_and_if/buy_five/sl.py b/python/problems/while_and_if/buy_five/sl.py
index 8008d91..3dbc9d3 100644
--- a/python/problems/while_and_if/buy_five/sl.py
+++ b/python/problems/while_and_if/buy_five/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 185
 name = 'Blagajna "vse po pet"'
 slug = 'Blagajna "vse po pet"'
 
diff --git a/python/problems/while_and_if/checking_account/sl.py b/python/problems/while_and_if/checking_account/sl.py
index 91a877c..86f973b 100644
--- a/python/problems/while_and_if/checking_account/sl.py
+++ b/python/problems/while_and_if/checking_account/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 200
 name = 'Tekoči račun'
 slug = 'Tekoči račun'
 
diff --git a/python/problems/while_and_if/common.py b/python/problems/while_and_if/common.py
new file mode 100644
index 0000000..3ca8844
--- /dev/null
+++ b/python/problems/while_and_if/common.py
@@ -0,0 +1 @@
+id = 14
diff --git a/python/problems/while_and_if/competition/en.py b/python/problems/while_and_if/competition/en.py
index f6399a2..215665c 100644
--- a/python/problems/while_and_if/competition/en.py
+++ b/python/problems/while_and_if/competition/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 185
 name = 'Competition'
 slug = 'Competition'
 
diff --git a/python/problems/while_and_if/competition/sl.py b/python/problems/while_and_if/competition/sl.py
index 2fedf14..195b51f 100644
--- a/python/problems/while_and_if/competition/sl.py
+++ b/python/problems/while_and_if/competition/sl.py
@@ -3,7 +3,6 @@ import server
 mod = server.problems.load_language('python', 'sl')
 
 
-id = 192
 name = 'Blagajna "konkurenca"'
 slug = 'Blagajna "konkurenca"'
 
diff --git a/python/problems/while_and_if/consumers_anonymous/sl.py b/python/problems/while_and_if/consumers_anonymous/sl.py
index cc5bcb7..131a13b 100644
--- a/python/problems/while_and_if/consumers_anonymous/sl.py
+++ b/python/problems/while_and_if/consumers_anonymous/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 201
 name = 'Klub anonimnih potrošnikov'
 slug = 'Klub anonimnih potrošnikov'
 
diff --git a/python/problems/while_and_if/minimax/en.py b/python/problems/while_and_if/minimax/en.py
index 10689ec..2aee417 100644
--- a/python/problems/while_and_if/minimax/en.py
+++ b/python/problems/while_and_if/minimax/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 200
 name = 'Minimax'
 slug = 'Minimax'
 
diff --git a/python/problems/while_and_if/minimax/sl.py b/python/problems/while_and_if/minimax/sl.py
index 2b07efa..0d934b8 100644
--- a/python/problems/while_and_if/minimax/sl.py
+++ b/python/problems/while_and_if/minimax/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 199
 name = 'Blagajna "minimax"'
 slug = 'Blagajna "minimax"'
 
diff --git a/python/problems/while_and_if/top_shop/en.py b/python/problems/while_and_if/top_shop/en.py
index a69ae9a..b8e5119 100644
--- a/python/problems/while_and_if/top_shop/en.py
+++ b/python/problems/while_and_if/top_shop/en.py
@@ -1,6 +1,5 @@
 # coding=utf-8
 
-id = 198
 name = 'Top shop'
 slug = 'Top shop'
 
diff --git a/python/problems/while_and_if/top_shop/sl.py b/python/problems/while_and_if/top_shop/sl.py
index b577633..334736c 100644
--- a/python/problems/while_and_if/top_shop/sl.py
+++ b/python/problems/while_and_if/top_shop/sl.py
@@ -2,7 +2,6 @@
 import server
 mod = server.problems.load_language('python', 'sl')
 
-id = 198
 name = 'Blagajna "top shop"'
 slug = 'Blagajna "top shop"'