IDB.log

commit b78761e391ea831a5dab8123f03104132b392574
Merge: 30c2355 66d6a51
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Apr 24 02:46:30 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 66d6a5128f8ef8b0e6fa8123a7f7d3a7c7fb30c9
Merge: 80cef65 97aaa07
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Apr 24 02:46:16 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 80cef651ce46c29798b7b4e6427eca9b9136546b
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Apr 24 02:45:55 2015 +0000

    Updated commit numbers

commit 30c2355064f2bc6cf57e5aa311a45240a640bd07
Merge: 3544574 97aaa07
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Apr 24 02:45:23 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 97aaa0757c3a7d8653a706ce695270af5fe453a3
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 24 02:43:44 2015 +0000

    hitboxes!

commit 3544574f36e65f1568ed8ca6326df4a23cb9aba9
Merge: 188db4a 5e22e16
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Apr 24 02:43:42 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 188db4a26c247b690480b7a484f0bd4f27eabb08
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Apr 24 02:43:18 2015 +0000

    (1) fixed athlete broken image

commit 5e22e162d6607ae0c5a29af2f74818af88517d04
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 24 02:40:08 2015 +0000

    padding

commit e57164ddbf46e574df25f233d106c04837c78a9a
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Apr 24 02:37:22 2015 +0000

    (1) restyle

commit 51488c2898f1f8d7183cde5d1164538f322c436d
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 24 02:32:37 2015 +0000

    removed unimplemented dropdown nav

commit 090a787f39a8359576e1db36c493b196b2a7b97a
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 24 02:27:12 2015 +0000

    updating athletes to be sorted

commit b79508a80f2190ccfb7ae49ba6009779ae242e14
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Apr 24 02:05:31 2015 +0000

    (1) styling

commit 67f7f28eba45978d29efe1a647a2b39d458d8ac7
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Apr 24 01:48:14 2015 +0000

    (1) Reformat layout in countries.html

commit d46fe6ad5146f581d544b10f224e3c8ac53fb227
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 24 00:54:49 2015 +0000

    minor athlete changes?

commit 29c14ed803556104a8fa1a28270b36da911b3824
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Apr 24 00:52:28 2015 +0000

    (1) reformatted search results page

commit 1c5be8312baf3e0ce42b9e9558768d51e4dec09f
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 24 00:32:02 2015 +0000

    minor changepython3 pythians.py

commit b37e279053b35eda78b7a976ebc7355121fc6ee4
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 23 23:28:43 2015 +0000

    Added downloaded files

commit 3f5687587158aaf5e58169d649090a3d2b9298f5
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 23 23:25:58 2015 +0000

    Fixes #155 Fixed scraper to download athlete photos

commit e9892f626fdf35b508cfc87e287e1c1883140251
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 23 23:21:24 2015 +0000

    Cleaned up starlords page results. Resolves #194

commit 4f000557e08238afd810a80378ed183af39b2c5f
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 23:03:58 2015 +0000

    Fixed travis ci infinite committing. Closes #193

commit b01d44676348990538d6afd7218511a99c566170
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:52:45 2015 +0000

    Changed reference to travis_run.sh in travis config file

commit e12c71166153e1049f7177af0c52c5268a72a156
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:48:01 2015 +0000

    Removed python-apt from requirements.txt

commit ad00357b462a5d975d07b9da556af33cc117919e
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:45:03 2015 +0000

    Removed pygobject from requirements.txt

commit fe194d11721fb706567dd3a8e58fb06a9885aa79
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:40:07 2015 +0000

    Removed language-selector from requirements.txt

commit 4d383ff91f1a6c9dbe0be0335a3fde77778c75c2
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:37:18 2015 +0000

    Removed command-not-found from requirements.txt

commit 0ec20f7ceadc6e0d289035af21fb921a308c5289
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:26:38 2015 +0000

    Allowing external sources for command-not-found

commit 9721621ac0834a2e2187c45935147d337960e512
Merge: 7740d32 e3b1fb2
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:20:29 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 7740d323d4de55735ea92a0f38c258234b38bd3d
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:18:31 2015 +0000

    Updated requirements.txt for travis ci.

commit e3b1fb2cf195c59e04175a3f10e25900e5cc3cb2
Merge: d0036a1 e076e89
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 23 22:14:32 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit d0036a1a1afd2dfd7b04497ffd55536c0b33bac3
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 23 22:14:29 2015 +0000

    Title cased all event names. Resolves #191.

commit e076e894c8906b9e37facc676b6ce276351d78d0
Merge: e5fc54b 0742d05
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:10:22 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit e5fc54bbce8b9ed741d9c9b485ab72021eed5849
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Apr 23 22:08:48 2015 +0000

    Make Travis CI commmit changes. Closes #188

commit 0742d05dff9252289c6fd5c362d75b9d358a4649
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 23 21:40:19 2015 +0000

    For game/id, made top countries only display three

commit f2a6cb3e3e540bf761b9baa6ddaf564b792f19be
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 21:15:17 2015 +0000

    removing athlete images from events.html

commit 05548ead47b7489682f3b50f7024758b4b30386e
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 21:14:43 2015 +0000

    Updating search results style

commit 69eff74ebc7579f6b0a37641190f394ef7d749f4
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 23 20:22:16 2015 +0000

    (1) Search bar now yields correct results and reroutes to results page

commit 9a4dcfc9641f032dadccbcc1cdaeb43e2aa657c5
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 19:57:21 2015 +0000

    reverting pythians.py

commit bfa96fcf342ced248a3b5843bb0c83d90bd672e5
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 19:52:45 2015 +0000

    removing nonworking route in pythians.py

commit 250226b7aa5fa23a9c838d205325ff7fe84b7bc4
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 19:22:54 2015 +0000

    updating search results in [search.html]

commit 86920d881f3e7191abc79a7c71f6429b4f3b35ba
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 23 19:20:14 2015 +0000

    (1) implemented search bar functionality

commit 301f7ecffdb830cb5fce3701081c9f9627af7eb8
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 18:28:56 2015 +0000

    Styling 'and' 'or' buttons, macro function for display results

commit ced30a0077b31189481f887ec2916b00e80db519
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 17:58:59 2015 +0000

    Adding 'and' and 'or' tabbed nav [search.html]

commit 7e41379f5b866c70115f8aff4b4b08ae826db33d
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 17:43:20 2015 +0000

    Temporarily disabling masonry due to performance

commit e59c4861efd6943e9bd3023eca915878bf1132e9
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 17:22:48 2015 +0000

    Migrating country flags to ../img/flags

commit 65abc4d8622395424ea5d9f2719ab0b6d9553c70
Merge: e046334 1b753c8
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 23 07:05:48 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit e04633435bd867020dd26c4870b5e5dd2fde4c11
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 23 07:03:20 2015 +0000

    Fixes #189 It's alive!! Currently storing pictures in the scrapeflag folder in static/img. This is for flags only not athletes

commit 1b753c8657897051bddd6f016255178684395366
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 23 03:24:17 2015 +0000

    Added interesting facts to starlords.html. Closes #163

commit d7b4f6eb9c96d2aff3f5f9514378a115cca688b6
Author: Eric Su <ericsu921@utexas.edu>
Date:   Wed Apr 22 18:57:46 2015 +0000

    (1) fixed image widths in index.html

commit 23a50da630c5180ec23002b47c224bf19032a6bb
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Apr 21 03:41:55 2015 +0000

    Set up travis ci, but without git commits

commit 7d676307f74537852e274b64ada167e0952ab6e3
Merge: 0c058cb e9773ea
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Apr 21 03:04:47 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 0c058cb3f5a4e6036780058520b6c3b8cedf7380
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Apr 21 03:04:32 2015 +0000

    Added html directory

commit e9773eadc69194be810fba080f68ab473a72b811
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Tue Apr 21 02:53:53 2015 +0000

    Added Limits on search query for Andy

commit ac6982683cdeebf16a98ee0f392dc4e8efdaf174
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Tue Apr 21 02:39:44 2015 +0000

    Wrote search tests. Resolves #187

commit 114fefc78fdb9ed49b02a31eb8bb2ec0870bad74
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Apr 21 02:27:13 2015 +0000

    Made genDoc work correctly

commit 45af9a49973db8a6076f81e13503d32708cfd920
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Apr 21 02:18:39 2015 +0000

    Added document generating script. Fixes #186

commit 20549ae68c2d8f171dd66c46b545b16005882c4a
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Apr 21 01:36:04 2015 +0000

    Adding filtering capability, updating search results [searh.html]

commit 30f5337d5fe3919011879274f1da89ae6dad5e34
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Apr 21 01:33:45 2015 +0000

    Changing search endpoints return type

commit 266a3be842bea4a2593de5950a1b2ec916348c3d
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Apr 21 01:32:09 2015 +0000

    Updating models to full database, added prefix searching. Closes #184

commit 81af51236a6e719116be1626febbbdebc3b0d195
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 23:03:41 2015 +0000

    Fixed typo in /starlords endpoint

commit a4b61a9b1c899e3638cf33c6b0e69e14cb3627d6
Author: Andy <andy.fan@utexas.edu>
Date:   Mon Apr 20 22:34:13 2015 +0000

    Removing unused sorting code [countries.html]

commit 6777a6086e9f11aa4166977a947f268a9aa202d1
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 19:20:40 2015 +0000

    Fixed incorrect avgConstPerFamily, fixes #183

commit 5ff8e2586694e010c6437335cf86bc4b7c76c5c2
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 19:17:17 2015 +0000

    Added planetWithLongestDay to /starlords endpoint, closes #181

commit 367aa6d3f0c6e4216817e5ba2e04ae5a21202889
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 19:14:56 2015 +0000

    Added planetWithMostMoons to /starlords endpoint, closes #180

commit 30b96e3760409061786a5f08299c01bb1c4c463a
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 19:13:13 2015 +0000

    Added hottestStar to /starlords endpoint, closes #179

commit 1f28678fbece8cf7b8ba007c4135927d1fcf1aa3
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 19:12:17 2015 +0000

    Added brightestConst to /starlords endpoint, closes #178

commit 9ab07ce0a4469c6779988c983e75d7c47d4f1a26
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 19:10:42 2015 +0000

    Added avgConstPerFamily in /starlords endpoint, closes #177

commit 48380e3742567b23c0bab37402bb5ee1edbfa495
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 19:09:22 2015 +0000

    Added avgStarsPerConst to /starlords endpoint, closes #176

commit 126db97f0cecc5d680188ed22d7b51cf257ffaf6
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Apr 20 19:07:36 2015 +0000

    Added starlords API critique, closes #182

commit 23f21f8e1113ef8fcfc02f9abea65c1a196af270
Merge: 92493ed 04e0b0d
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Mon Apr 20 04:00:30 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 92493ed23fa75b0693b9b052d36fb5a567b87cbb
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Mon Apr 20 03:58:47 2015 +0000

    Fixes #175 I forgot to edit the search vector to include the country_rep and country_host.
    The reason why mexico still worked is because mexico city hosted an olympic games so it was pulled when mexico was searched.

commit 04e0b0d8e3e61e5244b961625eeecd366067309b
Author: Andy <andy.fan@utexas.edu>
Date:   Sat Apr 18 21:17:03 2015 +0000

    Removing unstyled medal count for athletes/counties [index.html]

commit da7ee634fd635c0c70090d569cca08be0b1ff02b
Author: Andy <andy.fan@utexas.edu>
Date:   Sat Apr 18 21:14:13 2015 +0000

    Sort pillars in order. #163

commit ea48f0050d242aa9643bdb4d945d2e54fbfb5e4c
Author: Andy <andy.fan@utexas.edu>
Date:   Sat Apr 18 21:09:53 2015 +0000

    Populating entries from starlords endpoint #163

commit 5a000b2a835a207ecccbfe53bae918b81fc82e7e
Author: Andy <andy.fan@utexas.edu>
Date:   Sat Apr 18 20:35:58 2015 +0000

    Updating starlords endpoint

commit 1a7fef28a84ceefb904a845b20a7edbfb37a1344
Author: Andy <andy.fan@utexas.edu>
Date:   Sat Apr 18 20:35:39 2015 +0000

    Fixing color cycling issue

commit d38d02d58648d155904b0903ce52e4614094d2d1
Merge: e2dd6b9 b7d1386
Author: Andy <andy.fan@utexas.edu>
Date:   Sat Apr 18 19:47:47 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit e2dd6b9fe0c2e38bbe00bbff3c583b24dad65736
Author: Andy <andy.fan@utexas.edu>
Date:   Sat Apr 18 19:47:28 2015 +0000

    Re-enabling global nav search bar

commit b7d13861ae418f038729da25a56237f153962c89
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Sat Apr 18 19:46:49 2015 +0000

    Made it to where each item in each category of the search results has the data representing why it was included in the results. Resolves #172, resolves #167.

commit c7afe5f3e4e7cb968395e82a1d2d00c0257672b4
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Sat Apr 18 18:25:36 2015 +0000

    Seemingly found way to coalesce duplicates for near matches. Resolves #171.

commit dbe4311920f68952ec8436620a07b1edd4e03f44
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Sat Apr 18 17:45:48 2015 +0000

    Fixed duplicate stomping. Fixes #170.

commit 331e9eb369826ab3567bf5c324280485a42ef7a9
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Fri Apr 17 17:54:50 2015 +0000

    Made categories into list of dictionaries. Resolves #169.

commit 1b453634c3c0ff5b6dc2d88a5e79c0597f220a4f
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 17 17:42:23 2015 +0000

    Adding search.html page, updating search results endpoint. #167

commit 2cb12b5132504f4b5c8712d6a1bef8d8eefbfd21
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Fri Apr 17 05:18:05 2015 +0000

    Created search endpoint rough draft. Resolves #168

commit 07c80f2a94f8d7f619710c3f37ba54e6332395df
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Apr 17 01:25:59 2015 +0000

    Added gist index to searchable column

commit b1eee8012d468d82d8e7955e37b7053b7d2588e3
Merge: 5b2ac55 2f58677
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Apr 17 01:03:48 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 5b2ac553c1b709e9321e9b898a814e44d37dcb65
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Apr 17 01:02:33 2015 +0000

    Fixes #166 Added ts vectors to the database for search capability

commit 2f58677f0af10e24c56056f747ba8781cf115a7f
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 16 03:07:45 2015 +0000

    minor styling in about.html

commit 57bd7906d2d92458b0dd255a7a80aa6f72de50b7
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 16 02:53:39 2015 +0000

    Team info in about.html dynamially loaded from endpoint closes, #130

commit a80df6fdbd4ee11a1e57f2a64dcf1535c3a67ca1
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 16 00:51:03 2015 +0000

    Minor style tweaks on about.html, adding link to starlords.html page. #163

commit 1d5a35340fd187712d7f1cc9968e6ac6dde21c6f
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 15 04:39:42 2015 +0000

    Minor styling fixes for about.html

commit e64dd408b2ca770cc18ad78487c3f11a014c0fb8
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 15 03:39:43 2015 +0000

    Adding endpoint and template for displaying starlords API requests. #163

commit a82547fbda5e70c56caf566d009069ee8d8c91ad
Author: Andy <andy.fan@utexas.edu>
Date:   Mon Apr 13 07:12:22 2015 +0000

    Adding rich sortability on events.html and sports.html using mixitup. Updated color templating.

commit 17b34f80f8cea0b737b005533198e1677f5253b0
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 10 00:33:27 2015 +0000

    Updating IDB log file

commit 774d0247f86a56b9a655c0d35cb6ee00da8c68e9
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 10 00:32:06 2015 +0000

    updating team member stats

commit e84323a535f9ab835a7b4dca540989da24dabf40
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 10 00:28:15 2015 +0000

    format style for testresults.html

commit 342e9d5c7007712c39dc172f422b9f0857b96957
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Apr 10 00:04:58 2015 +0000

    reverting styling, updating about.html style

commit ca6431dd48e9055794067880470de023d95d04f4
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:59:20 2015 +0000

    minor styling on about.html

commit b3abbe525d8d4b09133a2d582e781ef6d546aea4
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:51:28 2015 +0000

    Resized test output in testresults.html

commit 034b004f3876a4643084f02cf97d49a1bd6fbc7f
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:46:39 2015 +0000

    fix top athlete athlete_id linking in sports/id

commit e6626402035e06e75b8543fb206a66528cf582a3
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:42:11 2015 +0000

    Adding sport name to sports/id

commit 04bfd72e87f2392adbea751272bffa26f4efbdc9
Merge: 45b1476 db95309
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 23:36:39 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 45b147668e4128568fae4e94a8ecc14208095fd2
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 23:36:01 2015 +0000

    Added sport name to return in sports_id

commit db9530946cb61fe195620b2378aed40f0d970451
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:34:12 2015 +0000

    fixed gender linking

commit 178d15dae2aca7861ece762570d5e0cee32654f5
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:22:41 2015 +0000

    fixed top athletes athlete_id linking bug on countries.html

commit 471e75bf3e5bc126f027fc70de6dc919aacf47fc
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:15:04 2015 +0000

    updating games.html style

commit 545769819f2742595733bbf27ab866f39e960a44
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:01:57 2015 +0000

    Updating testresults.html

commit 8acf121f25b17cf1081c7e02a32ef564b1475363
Merge: 6fb47de dd9533a
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:00:42 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 6fb47de18fef4f9e84755def3e6a7ab8b6c99980
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 23:00:01 2015 +0000

    Relinking datapoints in athletes.html

commit dd9533af99c1b138f32ffb6e7f37b91748ca507f
Author: Sabriel567 <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 17:55:13 2015 -0500

    Update README.md

commit a32a968b22f3a3f63ca89ff3cd765f72813abdd6
Author: Sabriel567 <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 17:52:57 2015 -0500

    Update and rename README to README.md

commit 25914c5631579f8de3301fc5fa2fb4c7ffb06d79
Author: Sabriel567 <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 17:50:09 2015 -0500

    Update README

commit a1502b5937ee5617544587d3d25b11c2c3d2999b
Author: Sabriel567 <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 17:49:14 2015 -0500

    Update README

commit 9814bb9faf9a5149addab7a1cc5229d39b8ec8de
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 22:30:35 2015 +0000

    Adding link to unit tests on about.html

commit d181854374b219d4fc4ead4212a0609afa63e166
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 22:18:43 2015 +0000

    Embedding gmaps, #120

commit 719ecd64bdf398aa8473f8ccb91e866cc083fcc7
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 21:38:27 2015 +0000

    (1) Minor adjustments to timeline layout

commit f38cc5dcf5183f22500ce69b727165d906daf13b
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 21:23:47 2015 +0000

    (1) Minor adjustments to layout

commit 6b24be080d2aa25fc8168c7247b24499d925adf1
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 21:18:55 2015 +0000

    (1) Centered text within cards

commit bbefd9d3aa6d94c05e485366682ecee023373ccc
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 21:16:44 2015 +0000

    (1) Made athlete image clickable

commit 7139a973bb74f4d5407333efd4e6e377d68f2d29
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 21:15:05 2015 +0000

    (1) Fixed image layout

commit 0a034d8a61e45eace83ac8aecbc774c7cf6df1fd
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 21:08:14 2015 +0000

    (1) Redesigned Featured Countries layout - Resolves #162

commit de6d4b318278e76c23791e794cbb629f6d679ad4
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 20:48:33 2015 +0000

    Added dedicated test results page

commit 340e2441f48704d6a8d29b71b092609fb21628bd
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 20:32:29 2015 +0000

    (1) Redesigned browse country layout; (2) Make the columns responsive (not yet for mobile)

commit 4995a1865702bd03aa50cb7b3cad40aa8c46da17
Merge: e1a6620 b9802b9
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 20:17:29 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit e1a6620b7e687872d5a84d7530cb49ecbdad2eb3
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 9 20:17:26 2015 +0000

    Minor style adjustments. Fixed bad banner linking. Testing out hover preview #137

commit b9802b986a5a7750a1b0ff576b80d52299180799
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 20:11:45 2015 +0000

    Fixed linkable gender bug. Fixes #161.

commit f44427271c4de95807151552b114f0feb862d1f3
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 20:08:22 2015 +0000

    Made Athlete Table Data Linkable. Fixes #160.

commit 81ee2813338baedf0ec528eeebecd7f356c532f7
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 19:39:05 2015 +0000

    (1) Sports was overridden for some reason - Fixed

commit 6f84ce1b6e0b4efbc64b834f20c9712ab5d363e8
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 19:33:17 2015 +0000

    (1) Implemented sortability for events page - Resolves #156

commit 5ecb785a10d6708a30620bc09079287dd40eaff5
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 19:29:36 2015 +0000

    Fixed Broken Flag Image Links on Home Page. Fixes #157

commit 2146fa1e7d9480a59db931291b90d99390c2e0b1
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 19:26:42 2015 +0000

    Added names for featured athletes and featured countries on the home page. Fixes #159.

commit b53e88b940414df1e540f11aaa1004b192fcf7ae
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 19:18:57 2015 +0000

    Fixed issue with scrape endpoints. Fixes #158

commit 36fba1cea85e6912f91d2853b99a0b9becd26df5
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 19:11:58 2015 +0000

    No longer need scrape.py. Replaced by api.py

commit 8d03c62721afc95e0ce892ace1fb118b6b770493
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 19:09:43 2015 +0000

    Forgot to add default values for sortBy

commit 2438524dfea177f21a2dfe7a95ba52ddc52d2c13
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 19:07:31 2015 +0000

    Merged Eric's sort endpoints with the existing endpoints

commit 1de3211d9964a309646fcdd3759f337fea127abf
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 18:29:13 2015 +0000

    (1) Implemented sortability for sports page

commit df7b44a165197b537ec2c8a19b7312d583cba145
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 18:11:22 2015 +0000

    (1) Implemented sortability on countries page

commit b6f1800e5cffc7a74ecec85690050d94659a86ec
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 17:47:26 2015 +0000

    (1) Added ../sort-by pages to rest of the pillars in pythians.py

commit 8edb5f085788af658d7f35d80d5d5e078747c446
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 11:23:13 2015 +0000

    (1) Fixed port number in pythians.py

commit 97feb2faeca910d536fba0b7200edbd80f470c42
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Apr 9 11:22:19 2015 +0000

    (1) Added sorting function to athletes.html - still needs more work; (2) Added athletes/<sortBy> route to pythians.py

commit 70444412d63980035e8e8cb96eeaa26b35dfe927
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 08:08:27 2015 +0000

    Cleaned up athletes/id endpoint

commit 3c06434b457748e6c092f34674c6d3a9c39a12d7
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 07:22:45 2015 +0000

    Fixed blank results and random order. Fixes #140, fixes #141.

commit c38e0d1024c7db1fb81c44db106f2b52270daf4b
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 06:26:08 2015 +0000

    Fixes #106 Added sanity check on olympic genders between events and athletes

commit 18830aeb688e835b4fbd5add0eb47786fec81e55
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 06:04:27 2015 +0000

    Re #155 Created a basic scrapper. Currently only checks if the athlete page exists to get a picture from.
    Next step is deciding if we should download the picture or store a pointer to it in the db.

commit f7d46fbe491338a163b9a4318734cfdc09e4a2eb
Merge: 8bd7f4d 1182632
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 06:00:16 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 8bd7f4d3d390c6ade608212d843cf1264871c99d
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Apr 9 05:59:37 2015 +0000

    Fixes #154 Added array_agg_cust function to databases using procedures.sql

commit 118263286841f340ce01309209f79a49b2d7c018
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 05:37:45 2015 +0000

    Fixed sports page, and implemented the retrieving of events for the sports page. Fixes #152, resolves #153.

commit 7c3ee1a258177068ae45c2184f2c1fcd5ed10515
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 04:43:07 2015 +0000

    Cleaned up events endpoint and added sport name to output in case it is desired

commit 80bd9fdf9bca234f053734407dd05825f10ada37
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 04:30:59 2015 +0000

    Cleaned up countries end point and countries.html

commit 6bab3ccd0a24590f9d66ab9f5eaf8d1dcaf9381e
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 03:12:39 2015 +0000

    Fixed index endpoint, along with making it randomized. Resolves #151

commit eecac3718a7ebe693f64da4069e9d00e52eae621
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Apr 9 00:24:14 2015 +0000

    Separated the app from pythians because of import issues with getting the test results to an endpoint. Resolves #149, fixes #150

commit fd1f906db97fc9f76081f0490084804261365744
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Apr 8 18:27:25 2015 +0000

    Wrote RESTful API Tests. Resolves #127.

commit 94a713fb76a4295110ab35f5f1eb0cc5146dfe70
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Apr 8 13:12:53 2015 -0500

    Changed Name for Getting Medals by Rank

commit 304a33fc07f3982444067ffc836c660e2d1aa514
Merge: ee4fab7 328be4f
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Apr 8 07:22:21 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit ee4fab7688e12572fab31cea2e06f56b3ced38c4
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Apr 8 07:21:51 2015 +0000

    Updated athletes endpoint to include lastest_year_id. Resolves #147.

commit 328be4fd0fed8f4ba8e678bf4a1fc9ddec2d3818
Merge: 8694fb4 14624b2
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 8 05:44:15 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 8694fb4289fe5ebaa3dcfd327f47ed05755d2ba1
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 8 05:43:53 2015 +0000

    Showing years hosted for countries.html and countries/<id> pages

commit 14624b2b2ed4e054aae3ea4a97243a12122ef786
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Apr 8 00:30:44 2015 -0500

    Updated Apiary API. Resolves #148

commit 3accfbab690193689a54ed4f91627a81402d18d5
Merge: 42ecb69 0898bfb
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Apr 8 05:27:37 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 42ecb69c303a1ff9169cd10441fb6225e3ffe70d
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Apr 8 05:27:06 2015 +0000

    Moved scrapes to api.py file and enhanced scrapes. Fixes #32, Fixes #43, Fixes #145, Resolves #146.

commit 0898bfb18ea9c26df2d59611d38ee69284377b4a
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 8 05:22:02 2015 +0000

    Populating endpoint data for athletes.html, countries.html, and index.html. #133 #134

commit c819b2874fc82a8198e326818e15a6b86c3fa954
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Apr 7 23:08:14 2015 +0000

    Added sports to events.html

commit 3f065872405335bcdcc27cbce11d91948d83fa46
Author: Eric Su <ericsu921@utexas.edu>
Date:   Tue Apr 7 01:24:48 2015 +0000

    (1) Sort athletes by name

commit 02e79efaca28f8c7b229842b9efe5bb7ad309a67
Author: Eric Su <ericsu921@utexas.edu>
Date:   Tue Apr 7 00:51:15 2015 +0000

    (1) Redesigned cards; (2) Widened results container in athletes.html

commit 78bc4d44c72c817413259b712c63d6bac5b61237
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Apr 6 03:57:47 2015 +0000

    (1) Removed img hover animation

commit 48f8b887e0081e23768881ee74738078974a4f15
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Apr 6 03:41:18 2015 +0000

    (1) Centered masonry; (2) restyled cards

commit fd57913ffac182dcff85b987a10ff81afdef58f6
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Apr 6 03:00:07 2015 +0000

    (1) Fixed masonry bug; (2) Reindented athletes.html

commit 8d1db106f8fb7cd459dcd6178f9923b457d5bc43
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Apr 6 02:54:37 2015 +0000

    (1) Implemented masonry plugin; (2) Updated jquery tag-lines within base.html

commit 6abbf1b00762a0fd96e989dcf86d118e50e37925
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Apr 6 01:39:28 2015 +0000

    (1) Converted athlete list to tiles

commit 5a5825917a8ba6f586becc2dec1d948d3435a24f
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Apr 6 00:57:41 2015 +0000

    (1) Fixed blank name and country fields - RESOLVES #142

commit 7cb82460881e29d38168aa3afae820f108f2c96d
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Apr 6 00:34:50 2015 +0000

    (1) Added medal icons; (2) Divided main content into 3 columns; (3) Created cards; (4) Added athlete year

commit fac9aea02a47f96402409e06a3aed4356cfc6023
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Apr 5 22:56:31 2015 +0000

    (1) Centered headings; (2) Divided main container into 3 columns

commit a9c2b149ca1800f802ab2d14754e9a5db8d92004
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Apr 5 22:40:35 2015 +0000

    (1) Reformatted Featured Events tiles

commit 2b568a7c8974027c5df59d1c056007786a556767
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Sun Apr 5 03:55:04 2015 +0000

    Fixes #138 Cleaned up the query for the games id endpoint

commit caad73599675e077be34712491788b6b64a7dd16
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Fri Apr 3 17:25:47 2015 +0000

    Removed an extra print statement

commit eead07f168f0c03cb713c290e656769f966bde32
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 19:41:34 2015 +0000

    fixing country banners in index.html #131

commit 13aa21e03039a982b06bcbc1b322562cfe001bf2
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 17:14:21 2015 +0000

    country banners on countries.html, #128

commit bb01b9a102f3cbf0d8d070ddddd08c34d059d32b
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 16:49:58 2015 +0000

    Renaming flag filenames to country_name.jpg, #128

commit 6c4c061857d396ce3577e62503f97e0dd323fe19
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 16:45:27 2015 +0000

    Displaying country banners on games.html #128

commit b61302111f0cd87e5ce5ab3b9d84a0698988d441
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 16:39:59 2015 +0000

    Adding baners to games.html, #131 #130

commit 15a985fc5f4c5ea4a9dad872c75bb888c52854d4
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 16:31:33 2015 +0000

    Displaying  all_events to events.html

commit c8d2ad53dcd0719e817a990998c4e51089c66e57
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 16:28:23 2015 +0000

    renamed athlete filename to match endpoint

commit fe18b244889694a462eb98fa3338a86e4f98685b
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Apr 2 06:08:35 2015 +0000

    Fixed incorrect join order in ca98864

commit ca98864989bf738e43e7ed2e99424f4dbac3197b
Merge: aad95b2 b56b6c8
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Apr 2 05:51:11 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit aad95b2d10e42017c15658a38f90d9e465b062a1
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Apr 2 05:50:15 2015 +0000

    Fixed incorrect all_countries query in /countries endpoint

commit b56b6c89d7d4ce3d48b12f3f9db0ec0773a7f6c9
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 05:10:03 2015 +0000

    some style fixes

commit 4f94c6aa2bb415b5bc35f79aae66b531af035f5b
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Apr 2 04:58:44 2015 +0000

    Added featured_events & fixed all_events name in /events, final fix for
    country_id() total_athletes & country_name bug

commit 1213705d5f9ed0cd46384facc840f22e38c13454
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Apr 2 04:49:36 2015 +0000

    Fixed country_name & total_athlete format return bug @ country_id

commit a7acbe8ee4d0546dc1aba446b457c759de0780a9
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 04:24:35 2015 +0000

    Fixing top_event exception, added debug statement

commit 4ec056dd51325c556c45162c3f9ae0a79a2cc9c7
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Apr 2 04:22:35 2015 +0000

    Finished updating html to match endpoints

commit 20c5c23d19f3fff4e397948fd9eea2aaf716c40e
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Apr 1 23:43:30 2015 +0000

    Updated athlete endpoints and countries endpoint

commit ddec6c33cf3b60a1e4a32b6b2fb2974aeaa56d73
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Wed Apr 1 23:35:15 2015 +0000

    Matched endpoint returns with comments. Resolves #122

commit e6d2e4ee647d5aed0b841b451cb4d9f801c3c0d3
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 06:03:17 2015 +0000

    displaying athlete banners on index.html, #131

commit 81d5ad439277e7a56f78ddf7c9bb3586319ea4e9
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 06:00:19 2015 +0000

    Displaying athlete photo on /athlete.html and athlete/<id>. #128 #131

commit 8bcec9646a67284a1c777fe3d79e84c604b78483
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 05:20:09 2015 +0000

    fixing broken img link. fixes #129

commit 8d61c96428f34b38e22d54d604608cf8f594f5a3
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 05:11:09 2015 +0000

    renamed flag extension

commit 7311ba29cb305c62f7e7787230793e48cd65fc01
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 05:05:53 2015 +0000

    Updating games.html img placeholder style

commit 55838e066f7c7f05785fb34f0e57e66b2468e136
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 04:34:30 2015 +0000

    Updating countries/<id> to display flag. #128

commit ff01f19a05923533984cf5c7b0ac5ea20fc90485
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 04:03:25 2015 +0000

    fixed typo in scrape.py

commit bb5dd6f92371c53f0fae9fe290a1096d055da4c9
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 03:57:56 2015 +0000

    Refactoring html templates for updated endpoints. #119

commit 55829e383bb879631307e28b712b20515b95c60f
Merge: df6732e 04e490c
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 03:56:36 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit df6732ebe1d43d7e53542d4fb7884ff4a29dd038
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Apr 1 03:56:25 2015 +0000

    Renaming country flags to <id>.jpg

commit 04e490c0c41bb33663f6e388d9509a9e4b62848c
Merge: 184e1fc 2ed007e
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Tue Mar 31 23:25:25 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 184e1fcacd9ebf07db54da2fb503df08d67d38df
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Tue Mar 31 23:25:22 2015 +0000

    Updated the RESTful API. Resolves #126.

commit 2ed007e22b9453550c4935749177c8c6a210630a
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 31 22:50:44 2015 +0000

    updating timeline style

commit 9aa9b96b1e9a23a121d876903c0ad703ea0c2bb6
Merge: 25dc26a e5710fe
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Tue Mar 31 03:58:27 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 25dc26a653ecf597a4f4e208b78e3e2a9a0319f8
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Tue Mar 31 03:57:13 2015 +0000

    Standardized endpoint return formats, closes #122

commit e5710fe87a1ec981abe4d127dd03dce3817d5cb2
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 31 02:09:56 2015 +0000

    Reorganizing static files

commit f738d6df8920178206e525ab738f4d60f4342c15
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 31 02:04:26 2015 +0000

    updating Germany flag

commit bbfb73a21967ff1709ed852f213dd895d331720a
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 02:47:51 2015 +0000

    updating log

commit 3c35df75c5bef24ffc88c19ae1f428a9c76496e7
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 02:45:19 2015 +0000

    Readd script

commit 21ba6fe5a2b2534b9a81c68de9555a6279869762
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 02:40:24 2015 +0000

    added log

commit 388e61eb38cd0d38aaf4c96cd9964a86e4d8d023
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 02:37:11 2015 +0000

    removed link

commit 5278e7f7390036263aed5ba78d31555e9f263ef8
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 27 02:34:23 2015 +0000

    (1) Fixed countries/<id>

commit 367e7df1fbc4076b6b4638ca15980fa4e566a7d7
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 27 02:31:52 2015 +0000

    (1) Fixed events.html/<id> layout bug

commit e770090ad60aed5e401e7ffbd6162dda1775fe7b
Merge: cb6341f 1a82408
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Fri Mar 27 02:28:07 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit cb6341f23d3e932cc01c3b5c4c5aa9021fb872ca
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Fri Mar 27 02:27:51 2015 +0000

    Changed DB ip address

commit 1a824085d5abde58932f8d023b1be0165d2d6bfe
Merge: c9a524a cf37d5e
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 02:20:14 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit c9a524a6370ab5ab317d3ae84fbfeee00b40a4a6
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 02:20:06 2015 +0000

    Appending links to pillar attributes

commit cf37d5eb52c0e5ae37a527c589bbe133e1a66346
Merge: 7985e5e 5f1d8ea
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Fri Mar 27 02:18:42 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 7985e5e33b86aadcff88ac1c57ed918d57570d58
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Fri Mar 27 02:17:19 2015 +0000

    Fixed models.html

commit 5f1d8eaac48b4a126b4185370994c69c1bf199bc
Merge: f0a5994 8e3d964
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 02:13:55 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 8e3d964d1257b6d9343acf26670a7288ae2618e7
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Fri Mar 27 02:11:34 2015 +0000

    Added documentation. Closes #118

commit f0a599448f0dda829be2ac59b3398ec3b134173a
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 02:07:27 2015 +0000

    Fixed issue with total gold medals in country/id

commit c59ae7a6c223dab43686372d9896df071a7a397c
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 27 01:57:50 2015 +0000

    (1) Created countries.html/<id>

commit c6985750f770386ba14c93f0035342a29b019eb1
Merge: 52b536e 27f9546
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 01:46:01 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 52b536e4bdcf23f2a3e888e2b19871ae20bd9a7a
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 01:45:28 2015 +0000

    Changed events id query to work with front end

commit 27f9546ce51099837f66b948a58f6baf20291ae3
Merge: ab19a68 29a1cbf
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 01:41:39 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit ab19a684387a20a46b2e14b6149744418ae4dc8a
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 01:41:12 2015 +0000

    Updating about.html

commit 29a1cbf6c43daf596d8f85da1f15901d299922f0
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Fri Mar 27 01:34:17 2015 +0000

    Fixed bug in athletes.html

commit 28f383c8ad118cb83532fd53cc8d93fae5d61759
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Fri Mar 27 01:25:23 2015 +0000

    Added all countries extra info

commit f9781671dce54729093b522d5fe25a93ea8b4478
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 01:14:35 2015 +0000

    still updating about.html

commit 6615819e20017c62f5f9011120464039d94b8e98
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 00:48:04 2015 +0000

    Added pictures for both athletes and flags

commit 092fb331056c13028ae8034fe65744761e901eb5
Merge: e22d17d 86c83fa
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 00:46:49 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit e22d17d5e4fd2086f421c6dc57fe88aa812770ca
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 00:46:09 2015 +0000

    Added event name to return for events_id

commit 86c83facfcb1a1fef07e71d0ee72d5fd56eec59b
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 27 00:44:58 2015 +0000

    (1) Created events.html/<id>

commit 1ca98f8d4f6bcd4eed9f91ac6b807340436223a2
Merge: d2521e9 f2d4c09
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 00:09:55 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit d2521e9b3a27d1fa1c571c31b3f849c5e3fb6274
Author: Andy <andy.fan@utexas.edu>
Date:   Fri Mar 27 00:09:43 2015 +0000

    reverting port number

commit f2d4c098901d0ae4311e0fb6e0d6f6473bc3b1be
Merge: 151375d dbfe7ad
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 00:08:15 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 151375dc8efd9e3b4192ae8e58da194743b7ba66
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 00:07:19 2015 +0000

    Fixed db schema. Removed "Text" from picture

commit dbfe7ad411936c8050e99b84b2ff10516eafe9b7
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 27 00:05:01 2015 +0000

    (1) Created athletes.html/<id>

commit 712e05e09bf2a055bc2abdbefd0d6545f12bbcb3
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Fri Mar 27 00:00:45 2015 +0000

    Added the UML pdf diagram

commit 5ce572cddd09057a0c228bfae377bbce4fc8e4ee
Merge: 02e7ee5 2f7cbde
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 23:33:18 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 02e7ee5d8c3e46cc3bbfc694e207a94cc2b52a5b
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 23:32:42 2015 +0000

    Added tests.out

commit 2f7cbdee154b312ecfcacbba41fd28ec7eb49f6d
Author: Sabriel567 <sabriel@comcast.net>
Date:   Thu Mar 26 17:54:47 2015 -0500

    Transferring blueprint from apiary.io

commit 83ddf039d844deec503d57ec0d98c98c8b2294ff
Merge: 27fb60f ce53446
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 26 22:44:17 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 27fb60f06ae426d8a8a562f6e36df57dc030e4a8
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 26 22:43:59 2015 +0000

    Removing the apiary api

commit ce534465427d51cac5c743da41e06461193855b2
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 22:41:50 2015 +0000

    updating about.html

commit 4b7f77115bbe6894abbadcce8a20fc05797f4722
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 22:33:51 2015 +0000

    finished endpoints for index.html, updating to 4 per featured pillar

commit 1ec72109c6c27d0157966fe098ca3b00e3ab8a7e
Author: Eric Su <ericsu921@utexas.edu>
Date:   Thu Mar 26 22:31:08 2015 +0000

    (1) Created games.html/<id>

commit 3c8b0cdd6bbded8c4a8c79613dd3909ac50c44fc
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 22:21:19 2015 +0000

    Comments refactoring, added asserts, fixed Athlete recent country bug

commit 476710f85aa08ce5acf7b180832b0511f979b901
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 22:10:28 2015 +0000

    still filling up featured pillars in index.html

commit 7b1fc29a6964ab2ce4b064ae00dc43dfa11b0199
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 21:33:18 2015 +0000

    hopefully restoring all the overwritten conflicts

commit 97627af4d450cba07a6ff24d7049de8a11de6274
Merge: e9911d9 0143fb3
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 20:47:29 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb
    
    Conflicts:
    	pythians.py

commit e9911d9889146dcd2cd37877776adde786eecab1
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 20:42:20 2015 +0000

    Fixed all_countries & all_athletes unpacking bug in games() endpoint

commit 0143fb3b594507868ff575af8be232152f21cbb8
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 20:41:47 2015 +0000

    updating limit values

commit 69d8c708cbddea00a6f96862b5c9c77d890a7378
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 20:16:40 2015 +0000

    Hiding /sports/ from explore bar and narbar. closes #113

commit 5228cdc14e560fbad306d3267d0722f1a55cc6d4
Merge: d595786 8d4488e
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Mar 26 19:37:36 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit d595786d460da13be6a8e6459e02b39f7b20f210
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Thu Mar 26 19:36:54 2015 +0000

    Added a photo of me

commit 8d4488e9128e6421c99e09c208e56d931b36bcd9
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 19:24:12 2015 +0000

    Updating about.html with portfolios

commit be0f641881c41e7de17b1ae396559ee1fa2f7c5b
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 19:03:32 2015 +0000

    removing unused search bar

commit dbb67c59d862b09eae091479101f316305a86978
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 26 18:52:08 2015 +0000

    Changed featured athletes into all athletes for Andy

commit fda01e779f1963fa650d009cd8b86c9ae5cc1e2e
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 18:07:11 2015 +0000

    still connecting pillar endpoints

commit a7ace5096d3792e5f3bdc7fe5c77306f1c38972d
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 18:06:29 2015 +0000

    fixing typo in sports route

commit 48ee9ca6487f3624f950f7ba2800046079ea6679
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 16:56:47 2015 +0000

    connecting endpoints for /athletes/ and /sports/

commit 1490bf6e4fd95919dc2ab1ef8ca663bd2842977f
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 26 02:34:13 2015 -0500

    Fixed typos and added additional info

commit 452af14762b88ababb59933a95289a4ca54409bc
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 26 02:28:24 2015 -0500

    Added gender to athlete scrapes

commit 14c4c3bb2a680149ce36a83f6e9575784c1c151d
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 06:10:44 2015 +0000

    Adding check condition for /<pillar>/ vs. /<pillar>/<id>

commit c8cc29e7c9e12cf0e0322cdd684eec3322df3aae
Merge: c9ac4c7 69dc47f
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 06:02:41 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit c9ac4c7ce6c6904ee67bf2f4dc026c01b721e463
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 06:02:22 2015 +0000

    fixing athletes.html return statement

commit 69dc47fc6c87a3853b1d7d999af6c2b495d91bdc
Merge: 8cffee4 612f4a7
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Mar 26 05:02:57 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 8cffee4b2706bf04bf90d8fcdd4f85243b3dc837
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Mar 26 05:02:06 2015 +0000

    Added the schema_script used to build the database.

commit 612f4a71e59a114aeb1c0f1cbe5085b9d9b1d857
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 05:00:39 2015 +0000

    commenting out debug code

commit 3eb7dd41e46c583efed21604c8645f5d22261d9a
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 04:53:40 2015 +0000

    Populating more featured pillars with endpoint data

commit 58ec60c69efdbae4129d1e679b14b2bd3589edbd
Merge: 8b2ed55 da7575a
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 01:17:26 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 8b2ed552aacf5ef3e0332bc4c0885afc8ad1194c
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 01:16:42 2015 +0000

    Added Sports model unit tests, closes #105

commit da7575aad432e86aae23f974164f2f8c2e3ed99c
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 01:08:32 2015 +0000

    fixing typo

commit 1a87b7f08c83e921d9c2daa3cad0c19895d4e852
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 01:07:11 2015 +0000

    removing commentted code for athletes endpoint

commit bb76c6c39cc6dec89cb3e74a187a36656b1b2cc1
Merge: 835ffe2 9d92d9c
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 01:03:49 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 9d92d9c40557b46198169b80e5a4a6e5025d8f40
Merge: a1efe15 5f07fbb
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Mar 26 01:03:14 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 835ffe2cb7f254c89c273058a2533bd30be3923a
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 01:03:06 2015 +0000

    Added Events model unit tests, closes #104

commit a1efe15be3633a914de4173994c318c09a60ba35
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Mar 26 01:02:46 2015 +0000

    Fixes #12 Added UML diagram with db schema

commit 5f07fbb06cdae1f65c21956e45456585cbe034fa
Merge: 155fa59 cee79bb
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 26 00:51:24 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 155fa59a23e1819b8b8320cd5085d72ca13a10f0
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 26 00:51:04 2015 +0000

    Fixed sorting years bug. Fixes #98

commit cee79bb9654c23262d9b01a12e669bccecc1f212
Merge: 4703c01 5dcb5fa
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Mar 26 00:48:22 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb
    
    Conflicts:
    	tests.py

commit 4703c0107f68bcf5810988f24e4ae681c23c44e9
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Thu Mar 26 00:45:58 2015 +0000

    Fixes #103 Added testing for medals table

commit 5dcb5fa65d385dcc1fd565782df6a7095396c6b8
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 00:41:26 2015 +0000

    updating index, removing old team portraits

commit 262ecfe9cbf777249a65c64d807afb1e3c258afc
Merge: 4b6cd7b 555ba11
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 00:31:02 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 4b6cd7baae66546d37ccd2a31e78ced581b6066f
Author: Andy <andy.fan@utexas.edu>
Date:   Thu Mar 26 00:30:49 2015 +0000

    Bug fixing in pythians, adding more about portraits

commit 555ba1140ff82317911d2d061dcb0d91d4096bda
Merge: c33d451 113ca60
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 00:24:01 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb
    
    Conflicts:
    	tests.py

commit c33d4515ec43fcc64b4ed1ff2078ac40444f971c
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 26 00:13:55 2015 +0000

    Added Olympics model unit tests, Closes #102

commit 113ca60bad7248efeb3915b0f5ff15c2751a4307
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 25 23:59:05 2015 +0000

    Created the tests for the City model. Resolves #101.

commit 1aeff5e4ba16de760b1c02ca1756398e79ad2d1a
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Wed Mar 25 23:03:34 2015 +0000

    Added Countries model unit tests, closes #100

commit f893d9eeb9a3efefb201b0d4df1619814d16388e
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Wed Mar 25 22:22:30 2015 +0000

    Adjusted singular/plural function naming for Athlete tests

commit e163b168c17c477ea6960b34066e5d9005c09842
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Wed Mar 25 22:20:14 2015 +0000

    Comment/formatting in tests.py

commit 50b09d9fa8b2807033966c4e4faf8157e8814861
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Wed Mar 25 22:16:44 2015 +0000

    Added unit tests teardown w/ session.close()

commit 22d2d262d99f7959d60b3ee3fa3e06e799db7e61
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Wed Mar 25 22:13:37 2015 +0000

    Added tests.py, Athletes model unit tests, closes #99

commit 9106780db8456cea1b0ec8a0dcbc5198510881a5
Merge: a46260e 91007e9
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 21:34:50 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit a46260e135b3006703a150b1774eedf68579a5f7
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 21:34:16 2015 +0000

    Added featured athletes to the index function

commit 91007e9b75cf37129b125937e38ddb3cda17d068
Merge: 2f9fcd5 63f0a21
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Wed Mar 25 20:47:44 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb
    
    Conflicts:
    	pythians.py

commit 2f9fcd50df4ff97541b9a13a729d8db01a65a6cf
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Wed Mar 25 20:35:31 2015 +0000

    Added IDs to pythian endpoints

commit 63f0a21e7d481c2d5ea068f27e945f45232e0336
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Mar 25 04:44:43 2015 +0000

    Updating countries.html to match endpoints

commit feaa13617cc3f3072ac85fbc7b7ef0c9ffc927d0
Merge: ee48c9f 82cffd1
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 04:38:02 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit ee48c9f474a211e071ab99d4fcdf29fffc6c22d5
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 04:37:30 2015 +0000

    Added featured countries to index call.

commit 82cffd158a1b08fd9e4c16f6c020dc9898cb3223
Merge: b298f54 76fb258
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Mar 25 04:32:16 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit b298f54140dd6e7723feb493689b33e11b10988c
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Mar 25 04:32:13 2015 +0000

    Implementing loading entries from flask model

commit 76fb258a4aa47ece84d2092519b16f976b1af77f
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 04:01:09 2015 +0000

    Fixed index function that was blown away

commit 824b5e4b661fc43f970a6f782df771f177193c0e
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Wed Mar 25 03:56:37 2015 +0000

    Added back in changes

commit f1d1188ea54b2c494998d2122517f2237dd44b6a
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 25 03:47:43 2015 +0000

    Implemented athletes endpoints. Resolves #84, resolves #85.

commit 2759091bdfeac345cbdfdedb4b489b7b7d5356b0
Merge: d915a98 dbe1fdc
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 03:41:19 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit d915a98afcdcbfe4e24e601c62b3a515759e101d
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 03:40:30 2015 +0000

    Added queries to index function

commit dbe1fdcbed89b340458b677ceae8a824dbd5c09c
Merge: ed7042a bc0660b
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Wed Mar 25 03:37:02 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit ed7042a927639a42eb07cfcf5338a249f111b1fb
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Wed Mar 25 03:35:51 2015 +0000

    Added countries.html/<id> endpoint. Closes #87

commit bc0660bee9336cb005d3c9b4341978979129523c
Merge: b05b0ab 76d6be7
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 02:51:40 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit b05b0abb0bab8dc9f7e055f1efc6a08f6a82be2c
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Wed Mar 25 02:49:10 2015 +0000

    Fixed issue in the populate table to remove duplicate row

commit 76d6be7ffb38a411c2984275c3c8fae2065e910e
Merge: d06e92e 3f5c028
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Mar 25 01:28:52 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit d06e92e9b95e752a04d921912c1f8f3192e7e729
Author: Andy <andy.fan@utexas.edu>
Date:   Wed Mar 25 01:28:13 2015 +0000

    Beginning to migrate html code  into flask templates. #82

commit 3f5c0283313036bed92a276e52a20551f61bc157
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Wed Mar 25 00:58:57 2015 +0000

    Added countries.html endpoint. Closes #86

commit 58e919079034fc8440ec8abc6bb41990364014b6
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Mar 24 23:26:34 2015 +0000

    fixed format of data from events.html/<id>

commit a1e2aa1e86f4282e30e078dd897e1b0acbc7600f
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Mar 24 23:14:43 2015 +0000

    Added stashed changes from commit 5844b00

commit 5844b00865ddc4b6146c5db34d4ff16e15a2dc71
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Mar 24 23:06:32 2015 +0000

    Added events.html/<id>. Change database to small db. Closes #89

commit b0c8f100c11d658f6a109ec053de0ef106b44c78
Merge: 7eb1a3e 971d4bd
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Tue Mar 24 22:53:59 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit 7eb1a3e8dfe4d81a38c2acf69c1419029aa71c9f
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Tue Mar 24 22:52:44 2015 +0000

    Added picture of MEEE!!!

commit 971d4bd0d094072f73f6ac945f0cbd59d6abeb7c
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 24 21:19:24 2015 +0000

    Adding routing for 404 error. Updating style.

commit aab09792a4cdf92f18bb7b7573d80d0f298e55b6
Merge: bd43f8f d4270a7
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 24 20:40:39 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit bd43f8fc010b1cd7687abb388f837938ed9b2cfb
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 24 20:40:20 2015 +0000

    Temporarily hiding nav search. Closes #97

commit d4270a75fb4fc3e5dabe65e402e52a80823c9531
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Tue Mar 24 20:22:12 2015 +0000

    Added my (Jacob's) headshot for about page

commit c1ed42b920742aca602423b553adbaa09a150768
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 24 20:13:29 2015 +0000

    Adding grid view on events.html #83. Closes #80. Closes #81.

commit cfe5aa3f8c538f6b6889ab7966fb5a961bb25f67
Author: Hannah <hannahb@cs.utexas.edu>
Date:   Tue Mar 24 09:19:28 2015 +0000

    Adding scripts and data that are used for populating both the full
    database, and the subset database.

commit b4a1ff3998c8172cf4507d79e279fc6aadb4ee58
Author: andythefan <andy.fan@utexas.edu>
Date:   Tue Mar 24 01:21:31 2015 -0500

    Adding placeholer events.html. #81. Replacing placeholder hyperlinks in navbars with actual URLs

commit 1e5e5797803b5a615ad9f94a75f0f0d28ece82d9
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 24 04:57:39 2015 +0000

    reverting server port to :5000

commit 3047bfb811dc4d20e3e50dd88054aa6e2326c539
Author: Andy <andy.fan@utexas.edu>
Date:   Tue Mar 24 04:55:59 2015 +0000

    Implemented about.html with placeholders. #80 Included responsive layout #57

commit 0c53417b9db519da273de6d6001e9f5fea888dba
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Mar 24 01:04:10 2015 +0000

    Added events.html endpoint. Closes #88

commit 60452c168f256dcda6ceaf8dd076190f6387ec27
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Mar 24 00:45:56 2015 +0000

    Added sports.html/<id>. Closes #94

commit f867a98dbd69d58ff1b19587ce2850d79dd62b84
Author: Patrick Aupperle <PatrickAupperle@gmail.com>
Date:   Tue Mar 24 00:18:29 2015 +0000

    Added sports.html endpoint, closes #93

commit e7d8bba02326dda1b20819f24c60e50a8cb53e9b
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Mar 23 23:23:45 2015 +0000

    Added games.html/<id> endpoint, closes #91

commit 653ede214f081e152d05dcf5470a5c2450c3ecd6
Author: Eric Su <ericsu921@users.noreply.github.com>
Date:   Mon Mar 23 15:03:44 2015 -0500

    Delete Headshot 02 (cropped).jpg

commit a2bc9691d213601caf8f27836c9c761e1b5fb052
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Mar 23 20:02:37 2015 +0000

    (1) Rename headshot file

commit 1345ef0cde79b3bb669af05a86eb0d6a8a5e91b1
Author: Eric Su <ericsu921@utexas.edu>
Date:   Mon Mar 23 20:00:38 2015 +0000

    (1) Added headshot

commit d78993303e97c74dde166068a515be4100bceac6
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Mon Mar 23 18:09:47 2015 +0000

    Added games.html endpoint, closes #90

commit 0cc0ad4ed43bd332dd36fefe014e143005eccc9a
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Sun Mar 22 23:38:24 2015 +0000

    Removed unneeded default parameters for endpoints

commit 2d947371389ba8938028c81e918b40c2ea030f04
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 14:33:23 2015 +0000

    (1) Fixed port number

commit 8d1ae971ca589b08e31b8458e574d95c8d817e80
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 13:20:01 2015 +0000

    (1) Changed color of results to gold in athletes.html

commit 1d80c6dc6e1d690b22619641f58f63438a3d7370
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 13:11:50 2015 +0000

    (1) Added athete portrait to index.html - Resolves #79. Still needs work

commit 50f21915c82b537c3bacb16f0f7de818333d99fc
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 12:38:00 2015 +0000

    (1) Added additional information to featured athletes in index.html; (2) Added endpoints to pythians.py

commit c87c38d93a0e1757b947d4f9be228e06d88b08b4
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 12:09:05 2015 +0000

    (1) Refactored layout of all pages by eliminating unneeded content div

commit 0aceb2723e5954f328f6de3dbf695d26dd7f1e9b
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 12:08:04 2015 +0000

    (1) Added Featured Sports section to index.html

commit bf39aa9e535a540e479af3e71653ad8ea1b9c426
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 08:39:18 2015 +0000

    (1) Added Sports and Disciplines section to sports.html

commit ef7234db900a1e8e2e3696a54b9f389f9b604f8f
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 07:11:13 2015 +0000

    (1) Removed gap between title and filter bar - Resolves #74

commit c057d0620cdd52e76260ac5a3b88999a4f8caf7c
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 07:03:39 2015 +0000

    (1) Changed title of index.html

commit 7cf10e15e6122aab4268a420e606cea7629dddf7
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 06:59:44 2015 +0000

    (1) Removed footer from featured sections; (2) Adjusted title position

commit 3208bfba0689ccf1bdb669ac37687469c08f9540
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sun Mar 22 06:47:23 2015 +0000

    (1) Linked timeline times - Resolves #64

commit a305fe4b78ed0d4ebd0b2100de278cb341c5a9de
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Sun Mar 22 01:21:42 2015 -0500

    Updated Apiary to the New Database Scheme. Resolves #69.

commit 856bbff6a312b2b5adaee15ac47cd5804eabb29f
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Sun Mar 22 06:19:37 2015 +0000

    Updated Flask endpoints to the new database scheme. Resolves #70.

commit 7440212271cb16611608713654952c85bc88d359
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Sun Mar 22 03:25:09 2015 +0000

    Pointed models.py to new Database

commit 919a68d834804a576bb2d0a617b635c0f1e41ea2
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sat Mar 21 22:40:26 2015 +0000

    (1) Refactored variable calls to flask (2) refactored links

commit fea3e6d982f00afba01ede48e4636a6b545a3a64
Author: Eric Su <ericsu921@utexas.edu>
Date:   Sat Mar 21 22:37:22 2015 +0000

    (1) Added app.route(/) and app.route(/home/) to render index.html; (2) Refactored remaining functions

commit 19fdccf72eeec4d73708509da457719ba22f9ce0
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Sat Mar 21 18:11:09 2015 +0000

    Added scrape_api import in pythians.py

commit 76cb88b8141f700d41ae5073a7383bb267cfdb56
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Sat Mar 21 17:47:33 2015 +0000

    Corrected the corrupted pythians.py file

commit b5438e45061053927d0b87b285eaaffdefd66614
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 21:30:17 2015 +0000

    (1) linked nav bar in countries.html; (2) make logo a hyperlink to index.html

commit 3ab54c73c5862e11a91ee7d3771ebc10798f5cc2
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 21:29:31 2015 +0000

    linked nav bar in athletes.html

commit 409b8aca8acb3f991d23267e8ecf1890f740b6d9
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 21:29:05 2015 +0000

    linked nav bar in games.html

commit 8b186bfb3fd4bf53dc1c6ff383058a3303453385
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 21:28:36 2015 +0000

    linked nav bar in index.html

commit 78c4ea84842bb48f91bfa6653aee9dc3250ba96c
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 21:26:17 2015 +0000

    (1) Created sports.html - Resolves #53; (2) Updated pythian to render all pages

commit d3349b65016dbe5349e93e40e6c9df9cb31b8420
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 20:36:51 2015 +0000

    (1) Removed search bar from games.html - Resolves #60; (2) Refined timeline

commit e737d0913c2147326cab28dcb5dbf5483e2cdea8
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 17:44:54 2015 +0000

    (1) Fixed title orientation. Resolves #58

commit 564afbb75fbad26c48c82bc55e5bb1e9a0af2ab0
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 17:33:18 2015 +0000

    (1) Fixed layout of search results in countries.html and athletes.html

commit 4851e4cd8d527b5a60a8a7b8847e4cfd24f7a256
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 17:01:23 2015 +0000

    (1) Built timeline for games.html; (2) Altered styles.css to style timeline; (3) Changed with of results container, resulted in improper formatting. Must implement responsive layout.

commit d8e63d6f92cf0f72884f273b2b6dba417fcc153a
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 14:23:15 2015 +0000

    (1) Added more fonts

commit ecda3bb829c38f15544089dead46f65f317d48d2
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 14:05:05 2015 +0000

    (1) Created countries.html; (2) Minor changes to style.css and pythians.py

commit f3fdc03ec03d06c0ca11e17187479d952da3fbfe
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 13:53:44 2015 +0000

    (1) Changed page font; (2) Created IODb Logo; (3) Added tables to Featured Athletes in index.html; (4) Added search bar to nav; (5) Added filters to athletes.html

commit 184641f1beb57606b6885d5292ebb3635ea00cf5
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 10:19:29 2015 +0000

    (1) Updated index.html and style.css; (2) created athletes.html

commit a60d38ba0baa396d42e3a5ea0d21f656299ac8ed
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 01:52:29 2015 +0000

    Created index.html and style.css

commit aaee6c2245cf9a79146c3702448cc815c9afe166
Merge: a94ae4a 84cd60a
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 01:42:53 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit a94ae4a092d33ea3901ea01a53e8e413d2d0bfe6
Author: Eric Su <ericsu921@utexas.edu>
Date:   Fri Mar 20 01:41:11 2015 +0000

    Created index.html and style.css

commit 84cd60a7f4e2a44944287db53341ebfffa8b70bc
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 19 04:11:46 2015 +0000

    Made the scrape blueprint have a url prefix

commit bc6879121c43e1392bd419d0ab5ad02221b80904
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 22:28:59 2015 -0500

    Converted lists to dictionaries because of jsonify's security. Resolves #46.

commit 35e18e54016f46c401c8fcea2d202c1f179a360b
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Thu Mar 19 03:06:10 2015 +0000

    Changed all to use jsonify and fixed a query issue with list all countries. Fixes #45.

commit 6a2a20efda1cfbe3a757a631987227c760dc51f4
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 23:54:20 2015 +0000

    Put the scrape api into a blueprint

commit 4ad08a480bf6b98bf2c6c2d8f42a6d85e36fdd63
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 21:38:13 2015 +0000

    Recommitting pythians.py. Resolves #42.

commit 59327e4404a7d117777b09464478b0938fa49439
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 21:36:39 2015 +0000

    Implemented Retrieve Medals by Rank in Flask. Resolvels #42.

commit 8f5af88e5a33fdf16a40fe03b78c419196cc2380
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 21:17:04 2015 +0000

    Implemented List All Medals in Flask. Resolves #41.

commit 4d12d0ea8d51124d28caa7ba2ee83f199190dade
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 21:09:25 2015 +0000

    Implemented Retrieve Medal by ID in Flask. Resolves #40.

commit 5110ce22f3b78a989a73f35e9357ef53be77cc91
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 20:54:28 2015 +0000

    Corrected port number

commit 70b97265acf2b74237959573e2e7e798733471ce
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 19:42:38 2015 +0000

    Implemented List All Athletes in Flask. Resolves #39.

commit ab1d20e935facd422036516378a6b96b2786f1a1
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 19:18:40 2015 +0000

    Implemented Retrieve Athlete in Flask. Resolves #38.

commit c51e6ddb611c11e6c9884e061680aff5ce9de87b
Merge: e14325b c250d68
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 17:47:28 2015 +0000

    Merge branch 'master' of https://github.com/Sabriel567/cs373-idb

commit e14325b712f87d833e9280956727b5a8d2344299
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 17:47:11 2015 +0000

    Implemented List all Events and Retrieve Event in flask. Resolves #36, resolves #37.

commit c250d689a3d11d235aae40c20b17b028eeb41b3b
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 12:26:12 2015 -0500

    Rearranged elements in json for list all years and retrieve year

commit fdeda25a5e6ac6aab455918386e1e19ac6c20ff5
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 17:20:53 2015 +0000

    Fixed 404 error with retrieve year. Fixes #35.

commit 1f5f76b4e53ac2299f3809e531936450c0300440
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 17:15:18 2015 +0000

    Implemented list all years in flask. Resolves #34.

commit b7cf4325ce8437a53471075e512de73134d4ce94
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 16:57:38 2015 +0000

    Implemented Retrieve Year in flask. Resolves #33.

commit d9460373d0c144481d56bc1370b3a25e6506964e
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Wed Mar 18 11:15:20 2015 -0500

    Added 'year' attribute to json for years

commit 6f95f444da0ee642ee083113da5246a9ae7c6840
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Tue Mar 17 20:03:32 2015 +0000

    Fixed retrieve country endpoint and added the list all countries endpoint. Resolves #30, resolves #31.

commit 5755331d1524a73ba6bb7494737061407ac348a4
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Tue Mar 17 10:31:00 2015 -0500

    Revised the year endpoints to include the type, summer or winter

commit 7f3c051de8a8a31e0a5f51c4d0c3aa68a64e0be8
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Tue Mar 17 02:06:51 2015 +0000

    Implemented a draft of the Retrieve Country endpoint in flask. Resolves #29

commit db9931630f0e3c3de917a07f76f74ebcfe3418ed
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Sun Mar 15 23:23:31 2015 -0500

    Revised the Rough Draft. Resolves #18, resolves #19, resolves #20, resolves #21, resolves #22, resolves #23, resolves #24, resolves #25, resolves #26, resolves #27, resolves #28

commit e8e5e19d7e4c9cd0fa2e552c6cd6aaa8456bf2c5
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 12 23:03:22 2015 +0000

    Updated pythians.py

commit dedd1338708219e7f989f65c720a0c452915d872
Author: Benjamin Pang <benben123213@gmail.com>
Date:   Thu Mar 12 22:59:45 2015 +0000

    Added flask models, example flask app, closes #15

commit 5149bba0215e71c55c366cb4121d1bd4e19b42c4
Author: aeroheim <benben123213@gmail.com>
Date:   Thu Mar 12 15:45:18 2015 -0500

    Added simple models.py

commit cc368ac1caa182a7cb8c2ef12424eb5dce197b03
Author: aeroheim <benben123213@gmail.com>
Date:   Thu Mar 12 14:49:03 2015 -0500

    Added main flask server

commit d3c049e896e3a7fae1548ad65a8fdadbce4fa2a2
Author: Jacob Kovar <jacob.kovar@utexas.edu>
Date:   Mon Mar 9 23:38:03 2015 -0500

    Rough Draft of what I got so far

commit 3bcb21e8f677b9074ea5e8e0c55959d86155cf80
Author: Sabriel567 <sabriel@comcast.net>
Date:   Mon Mar 9 23:21:25 2015 -0500

    Transferring blueprint from apiary.io

commit bbf95f6c8d6d15c2c0f437ab4979805802ed79c1
Author: Sabriel567 <sabriel@comcast.net>
Date:   Mon Mar 9 23:19:11 2015 -0500

    Transferring blueprint from apiary.io

commit a89aace1e022944444b40bb37b5d7dd87d0f16f9
Author: Sabriel567 <hannahb@cs.utexas.edu>
Date:   Mon Mar 9 23:19:06 2015 -0500

    Create readme