Ignore pycs
got some api's in
apis

yo
balh

bla
Cleared up requirements
Cleared up duplicates in requirements
Merge branch 'master' of https://github.com/txsl/hipflask
ss

adad
flask

flask
Merge remote-tracking branch 'origin/design'
Database is now working!! Quite a few changes needed to get this going
Merge branch 'master' of github.com:txsl/hipflask
merge

merege
sdas

merging design to master
search template

sda
Started work on twitter oauth. Also cleared up __init__.py
templating skeleton

merge from design
Merge branch 'master' of github.com:txsl/hipflask

Conflicts:
	__init__.py
Merge branch 'master' of github.com:txsl/hipflask
Merge branch 'master' into design